From d1806a0b62e9f17a6b7046586ad730b03f772a10 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?=
 <pengyuthon@user.noreply.gitee.com>
Date: Wed, 14 Aug 2024 20:39:25 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=AE=E9=A2=98=E5=AE=A1=E6=89=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 room/__manifest__.py                       |   2 +-
 room/models/room_booking.py                |  42 +++++++++++++----
 room/models/room_meeting_sign.py           |   2 +-
 room/models/room_room.py                   |  10 ++---
 room/security/ir_rule.xml                  |  20 ++++-----
 room/static/description/icon.png           | Bin 5755 -> 9399 bytes
 room/static/description/icon.svg           |   2 +-
 room/views/room_booking_views.xml          |  50 +++++++++++++--------
 yuthon_issue/models/issue_library.py       |  27 +++++++++--
 yuthon_issue/views/issue_library_views.xml |   4 +-
 10 files changed, 107 insertions(+), 52 deletions(-)

diff --git a/room/__manifest__.py b/room/__manifest__.py
index 7e607ded5..ccc09b6df 100644
--- a/room/__manifest__.py
+++ b/room/__manifest__.py
@@ -7,7 +7,7 @@
     'description': 'Experience the Ease of Booking Meeting Rooms with Real-Time Availability Display.',
     'category': 'Services/Room',
     'version': '1.0',
-    'depends': ['mail', 'hr'],
+    'depends': ['mail', 'hr', 'documents'],
     'data': [
         'views/room_booking_views.xml',
         'views/room_room_views.xml',
diff --git a/room/models/room_booking.py b/room/models/room_booking.py
index 1fb35c915..367e184c3 100644
--- a/room/models/room_booking.py
+++ b/room/models/room_booking.py
@@ -21,19 +21,43 @@ class RoomBooking(models.Model):
     office_id = fields.Many2one(related="room_id.office_id", string="Office", readonly=True, store=True)
     company_id = fields.Many2one(related="room_id.company_id", string="Company", readonly=True, store=True)
     # pengyuthon
-    meeting_type = fields.Selection([('up', '线上'), ('down', '线下')], string="会议类型", required=True)
-    room_users_id = fields.Many2many('res.users', string="会议参加人员")
-    meeting_note = fields.Text(string="会议纪要")
+    is_notice = fields.Boolean(string="是否发布通知", default=True)
+    meeting_type = fields.Selection([('up', '线上'), ('down', '线下')], default='down', string="会议类型", required=True)
+    room_users_ids = fields.Many2many('res.users', string="会议参加人员")
+    meeting_party_note = fields.Text(string="党之委会议纪要")
+    party_documents_ids = fields.Many2many('documents.document', string="党之委会议纪要文件")
+    meeting_class_note = fields.Text(string="班子会议纪要")
+    class_documents_ids = fields.Many2many('documents.document', string="班子会议纪要文件")
+    meeting_boss_note = fields.Text(string="董事会议纪要")
+    boss_documents_ids = fields.Many2many('documents.document', string="董事会议纪要文件")
     meeting_sing_ids = fields.One2many('room.meeting.sign', 'room_booking_id', string="签到详情")
     meeting_data = fields.Html(string="会议说明")
 
-
     def meet_notice(self):
-        pass
-
-    def meet_change_notice(self):
-        pass
-
+        if self.is_notice:
+            for user in self.room_users_ids:
+                self.env['room.meeting.sign'].create({
+                    'room_booking_id': self.id,
+                    'sign_user_id': user.id,
+                    'sign_user_name': user.name,
+                    'user_type': 'insiders',
+                    'sign_type': 'no',
+                })
+                self.env['project.task'].create({
+                    'name': '您有新的预定的会议' + self.name + "请知晓",
+                    'user_ids': [(4, user.id)],
+                })
+            event = self.env['calendar.event'].create({
+                'name': self.name,
+                'start': self.start_datetime,
+                'stop': self.stop_datetime,
+            })
+            for partner in self.room_users_ids.employee_ids:
+                self.env['calendar.attendee'].create({
+                    'event_id': event.id,
+                    'partner_id': partner.address_id.id,
+                })
+            # 企业用户发送通知
     def meeting_sign_in(self):
         pass
 
diff --git a/room/models/room_meeting_sign.py b/room/models/room_meeting_sign.py
index bbd5adc89..a72c8a054 100644
--- a/room/models/room_meeting_sign.py
+++ b/room/models/room_meeting_sign.py
@@ -10,7 +10,7 @@ class RoomMeetingSign(models.Model):
     _description = "会议签到"
 
     room_booking_id = fields.Many2one('room.booking', string="会议")
-
     sign_user_id = fields.Many2one('res.users', string="人员")
+    sign_user_name = fields.Char(string="人员")
     user_type = fields.Selection([('insiders', '内部人员'), ('outsiders', '外部人员')], default='no', string="人员类型")
     sign_type = fields.Selection([('no', '未签到'), ('yes', '已签到')], default='no', string="签到状态")
diff --git a/room/models/room_room.py b/room/models/room_room.py
index 8c5171200..5dc54b100 100644
--- a/room/models/room_room.py
+++ b/room/models/room_room.py
@@ -49,11 +49,11 @@ class Room(models.Model):
         for room in self:
             room.bookings_count = bookings_count_by_room.get(room, 0)
 
-    @api.depends("office_id")
-    def _compute_display_name(self):
-        super()._compute_display_name()
-        for room in self:
-            room.display_name = f"{room.office_id.name} - {room.name}"
+    # @api.depends("office_id")
+    # def _compute_display_name(self):
+    #     super()._compute_display_name()
+    #     for room in self:
+    #         room.display_name = f"{room.office_id.name} - {room.name}"
 
     @api.depends("room_booking_ids")
     def _compute_is_available(self):
diff --git a/room/security/ir_rule.xml b/room/security/ir_rule.xml
index a9afe351c..f92da61dd 100644
--- a/room/security/ir_rule.xml
+++ b/room/security/ir_rule.xml
@@ -7,15 +7,15 @@
         <field name="users" eval="[(4, ref('base.user_root')), (4, ref('base.user_admin'))]"/>
     </record>
 
-    <record id="room_room_comp_rule" model="ir.rule">
-        <field name="name">Room Room MC Rule</field>
-        <field name="model_id" ref="model_room_room"/>
-        <field name="domain_force">[('company_id', 'in', company_ids)]</field>
-    </record>
+<!--    <record id="room_room_comp_rule" model="ir.rule">-->
+<!--        <field name="name">Room Room MC Rule</field>-->
+<!--        <field name="model_id" ref="model_room_room"/>-->
+<!--        <field name="domain_force">[('company_id', 'in', company_ids)]</field>-->
+<!--    </record>-->
 
-    <record id="room_office_comp_rule" model="ir.rule">
-        <field name="name">Room Office MC Rule</field>
-        <field name="model_id" ref="model_room_office"/>
-        <field name="domain_force">[('company_id', 'in', company_ids)]</field>
-    </record>
+<!--    <record id="room_office_comp_rule" model="ir.rule">-->
+<!--        <field name="name">Room Office MC Rule</field>-->
+<!--        <field name="model_id" ref="model_room_office"/>-->
+<!--        <field name="domain_force">[('company_id', 'in', company_ids)]</field>-->
+<!--    </record>-->
 </odoo>
diff --git a/room/static/description/icon.png b/room/static/description/icon.png
index a305f8f720f8bc65c6beec4561ab7c09413eff3e..5068a3d9d9661e0e2b96aa0276f0bf53d217ebf3 100644
GIT binary patch
literal 9399
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

literal 5755
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

diff --git a/room/static/description/icon.svg b/room/static/description/icon.svg
index 41f9e0413..8992cc3fc 100644
--- a/room/static/description/icon.svg
+++ b/room/static/description/icon.svg
@@ -1 +1 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1723540042195" class="icon" viewBox="0 0 1160 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3773" xmlns:xlink="http://www.w3.org/1999/xlink" width="226.5625" height="200"><path d="M954.135893 0.273067H206.39744C92.5696 0.273067 0 93.02016 0 206.984533V485.512533a26.2144 26.2144 0 1 0 52.4288 0V206.984533c0-85.03296 69.05856-154.2144 153.96864-154.2144h747.779413c84.896427 0 153.954987 69.18144 153.954987 154.2144V485.512533a26.2144 26.2144 0 0 0 52.401493 0V206.984533C1160.533333 93.006507 1067.977387 0.273067 954.135893 0.273067z m-10.990933 730.221226a26.282667 26.282667 0 0 0 1.59744 37.082454 198.628693 198.628693 0 0 1 64.047787 145.85856 26.2144 26.2144 0 1 0 52.442453 0c0-69.932373-29.559467-137.216-81.05984-184.538454a26.2144 26.2144 0 0 0-37.02784 1.59744z m-587.257173-19.456c7.181653-4.396373 12.397227-11.79648 12.834133-20.834986a26.2144 26.2144 0 0 0-24.94464-27.470507 114.879147 114.879147 0 0 1-109.568-114.947413c0-50.95424 34.133333-96.41984 83.012267-110.646614a26.2144 26.2144 0 0 0 17.844906-32.52224 26.200747 26.200747 0 0 0-32.453973-17.885866c-71.133867 20.6848-120.832 86.87616-120.832 161.027413 0 55.7056 27.07456 105.171627 69.044907 135.65952a248.99584 248.99584 0 0 0-151.552 229.94944 26.2144 26.2144 0 1 0 52.4288 0A196.840107 196.840107 0 0 1 342.316373 715.844267c5.188267-0.109227 9.611947-2.102613 13.571414-4.819627z m502.00576-324.266666a26.187093 26.187093 0 0 0-32.494934 17.885866 26.241707 26.241707 0 0 0 17.831254 32.508587c48.892587 14.226773 83.012267 59.706027 83.012266 110.660267a114.879147 114.879147 0 0 1-109.554346 114.93376 26.241707 26.241707 0 0 0 1.2288 52.483413h1.2288a167.3216 167.3216 0 0 0 159.552853-167.417173c0.027307-74.17856-49.657173-140.41088-120.804693-161.068374zM580.266667 305.93024c-115.152213 0-208.786773 93.7984-208.786774 209.114453 0 74.615467 39.348907 140.055893 98.208427 177.07008-119.425707 45.001387-204.8 160.262827-204.8 295.417174 0 14.513493 11.71456 26.241707 26.2144 26.241706 14.472533 0 26.228053-11.75552 26.228053-26.241706 0-145.2032 117.978453-263.3728 262.9632-263.3728 115.152213 0 208.827733-93.812053 208.827734-209.155414-0.027307-115.3024-93.743787-209.073493-208.85504-209.073493z m0 365.745493c-86.248107 0-156.38528-70.260053-156.38528-156.63104 0-86.38464 70.137173-156.603733 156.38528-156.603733 86.248107 0 156.38528 70.260053 156.38528 156.603733 0 86.370987-70.137173 156.63104-156.38528 156.63104z m176.114346 84.650667a26.282667 26.282667 0 0 0 1.59744 37.082453 264.260267 264.260267 0 0 1 85.224107 194.123094c0 14.513493 11.71456 26.241707 26.2144 26.241706 14.472533 0 26.2144-11.75552 26.2144-26.241706a317.0304 317.0304 0 0 0-102.222507-232.81664 26.228053 26.228053 0 0 0-37.02784 1.59744z" fill="#9E9E9E" p-id="3774"></path></svg>
\ No newline at end of file
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1723602249003" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2933" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M798.326 124.18H225.674c-87.158 0-158.064 70.964-158.064 158.183v213.171a20.07 20.07 0 0 0 20.08 20.07 20.09 20.09 0 0 0 20.08-20.07V282.363c0-65.08 52.88-118.016 117.904-118.016h572.682c65.02 0 117.894 52.936 117.894 118.016v213.171a20.086 20.086 0 0 0 20.09 20.07 20.06 20.06 0 0 0 20.05-20.07V282.363c0-87.214-70.88-158.183-158.064-158.183z m-8.423 558.828a20.111 20.111 0 0 0 1.224 28.39 151.936 151.936 0 0 1 49.055 111.622 20.07 20.07 0 1 0 40.161 0 192.282 192.282 0 0 0-62.075-141.23 20.096 20.096 0 0 0-28.365 1.218z m-449.746-14.889c5.5-3.359 9.503-9.032 9.83-15.949a20.06 20.06 0 0 0-19.107-21.017 87.946 87.946 0 0 1-83.907-87.962c0-38.999 26.138-73.8 63.58-84.685a20.07 20.07 0 0 0 13.66-24.883c-3.087-10.634-14.253-16.799-24.857-13.69-54.466 15.83-92.549 66.493-92.549 123.232 0 42.64 20.751 80.492 52.88 103.829-68.578 29.158-116.066 96.758-116.066 175.97a20.08 20.08 0 1 0 40.161 0A150.682 150.682 0 0 1 329.764 671.82c3.983-0.082 7.368-1.613 10.393-3.702z m384.451-248.166c-10.609-3.139-21.801 3.026-24.883 13.69s3.026 21.801 13.66 24.889c37.443 10.88 63.58 45.686 63.58 84.674a87.951 87.951 0 0 1-83.912 87.972 20.086 20.086 0 1 0 0.948 40.156h0.947c68.52-3.25 122.173-59.52 122.173-128.117 0.031-56.77-38.016-107.464-92.513-123.264z m-212.613-61.855c-88.187 0-159.898 71.793-159.898 160.03 0 57.12 30.137 107.193 75.213 135.522-91.458 34.442-156.84 122.65-156.84 226.089a20.055 20.055 0 0 0 20.08 20.08 20.096 20.096 0 0 0 20.08-20.08c0-111.13 90.348-201.57 201.39-201.57 88.187 0 159.924-71.787 159.924-160.06-0.026-88.244-71.798-160.006-159.95-160.011z m0 279.91c-66.043 0-119.762-53.77-119.762-119.88 0-66.099 53.719-119.838 119.762-119.838 66.048 0 119.767 53.77 119.767 119.839 0 66.12-53.72 119.88-119.767 119.88z m134.876 64.773a20.106 20.106 0 0 0 1.224 28.39 202.173 202.173 0 0 1 65.264 148.573c0 11.11 8.976 20.07 20.086 20.07a20.08 20.08 0 0 0 20.076-20.07c0-67.548-28.55-132.49-78.295-178.181-8.11-7.475-20.829-6.953-28.355 1.218z" p-id="2934" fill="#d3a964"></path></svg>
\ No newline at end of file
diff --git a/room/views/room_booking_views.xml b/room/views/room_booking_views.xml
index 609623179..cc27467fe 100644
--- a/room/views/room_booking_views.xml
+++ b/room/views/room_booking_views.xml
@@ -23,21 +23,21 @@
         <field name="model">room.booking</field>
         <field name="arch" type="xml">
             <gantt js_class="room_booking_gantt"
-                date_start="start_datetime"
-                date_stop="stop_datetime"
-                default_group_by="room_id"
-                precision="{'day': 'hour:quarter', 'week': 'day:half', 'month': 'day:half', 'year': 'day:full'}"
-                default_scale="day"
-                dynamic_range="1"
-                color="organizer_id"
-                string="Bookings"
-                plan="0">
+                   date_start="start_datetime"
+                   date_stop="stop_datetime"
+                   default_group_by="room_id"
+                   precision="{'day': 'hour:quarter', 'week': 'day:half', 'month': 'day:half', 'year': 'day:full'}"
+                   default_scale="day"
+                   dynamic_range="1"
+                   color="organizer_id"
+                   string="Bookings"
+                   plan="0">
                 <templates>
                     <div t-name="gantt-popover">
                         <div class="o_gantt_popover">
                             <ul class="ps-1 mb-0 list-unstyled">
                                 <li>
-                                    <strong>Organizer: </strong>
+                                    <strong>Organizer:</strong>
                                     <t t-out="organizer_id[1]"/>
                                 </li>
                                 <li class="o_gantt_popover_content_item mt-2">
@@ -57,7 +57,8 @@
         <field name="name">room.booking.view.calendar</field>
         <field name="model">room.booking</field>
         <field name="arch" type="xml">
-            <calendar date_start="start_datetime" date_stop="stop_datetime" color="room_id" quick_create="0" event_open_popup="1">
+            <calendar date_start="start_datetime" date_stop="stop_datetime" color="room_id" quick_create="0"
+                      event_open_popup="1">
                 <field name="room_id"/>
             </calendar>
         </field>
@@ -93,11 +94,11 @@
                             <div class="oe_kanban_content">
                                 <ul class="ps-1 mb-0 list-unstyled">
                                     <li>
-                                        <strong>Room: </strong>
+                                        <strong>Room:</strong>
                                         <field name="room_id"/>
                                     </li>
                                     <li>
-                                        <strong>Date: </strong>
+                                        <strong>Date:</strong>
                                         <field name="start_datetime"/>
                                         <i class="fa fa-long-arrow-right mx-1" title="Until"/>
                                         <field name="stop_datetime"/>
@@ -125,8 +126,8 @@
                 <sheet>
                     <header>
                         <button name="meet_notice" string="会议通知" type="object" class="oe_highlight"/>
-                        <button name="meet_change_notice" string="会议变更通知" type="object" class="oe_highlight"/>
-                        <button name="meeting_sign_in" string="签到" type="object" class="oe_highlight"/>
+                        <button name="meeting_sign_in" string="签到" invisible="meeting_type != 'down'" type="object"
+                                class="oe_highlight"/>
                     </header>
                     <div class="oe_title mb-3">
                         <label for="name"/>
@@ -138,11 +139,14 @@
                         <group>
                             <field name="room_id"/>
                             <field name="stop_datetime" invisible="1"/>
-                            <field name="start_datetime" string="Date" widget="daterange" options="{'end_date_field': 'stop_datetime'}"/>
+                            <field name="start_datetime" string="Date" widget="daterange"
+                                   options="{'end_date_field': 'stop_datetime'}"/>
                         </group>
                         <group>
                             <field name="organizer_id" widget="many2one_avatar_user"/>
-                            <field name="room_users_id" widget="many2many_tags"/>
+                            <field name="room_users_ids" widget="many2many_tags"/>
+                            <field name="meeting_type"/>
+                            <field name="is_notice"/>
                         </group>
                     </group>
                     <notebook>
@@ -150,14 +154,22 @@
                             <field name="meeting_sing_ids">
                                 <tree>
                                     <field name="room_booking_id" column_invisible="1"/>
-                                    <field name="sign_user_id"/>
+                                    <field name="sign_user_id" column_invisible="1"/>
+                                    <field name="sign_user_name"/>
                                     <field name="user_type"/>
                                     <field name="sign_type"/>
                                 </tree>
                             </field>
                         </page>
                         <page name="note" string="会议纪要">
-                            <field name="meeting_note"/>
+                            <group>
+                                <field name="meeting_party_note"/>
+                                <field name="party_documents_ids"/>
+                                <field name="meeting_class_note"/>
+                                <field name="class_documents_ids"/>
+                                <field name="meeting_boss_note"/>
+                                <field name="boss_documents_ids"/>
+                            </group>
                         </page>
                         <page name="meeting_html" string="会议说明">
                             <field name="meeting_data" widget="tinymce"/>
diff --git a/yuthon_issue/models/issue_library.py b/yuthon_issue/models/issue_library.py
index c7f7281d4..81ccf98c6 100644
--- a/yuthon_issue/models/issue_library.py
+++ b/yuthon_issue/models/issue_library.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 from odoo import api, fields, models, tools
-from odoo.exceptions import ValidationError
+from odoo.exceptions import UserError, ValidationError
 
 
 class IssueLibrary(models.Model):
@@ -12,7 +12,8 @@ class IssueLibrary(models.Model):
     name = fields.Char(string='议题事项')
     code = fields.Char(string='编号', required=True, copy=False,
                        default=lambda self: self.env['ir.sequence'].next_by_code('issue_library_code'))
-    statu = fields.Selection([('will', '待上会'), ('done', '已上会'), ('cancel', '已取消')], default='will', string="议题状态")
+    statu = fields.Selection([('draft', '草稿'), ('approval', '审批中'), ('done', '已通过'), ('stop', '已拒绝'),
+                              ('will', '待上会'), ('done', '已上会'), ('cancel', '已取消')], default='draft', string="议题状态")
     is_party = fields.Boolean(string="党之委会")
     is_class = fields.Boolean(string="班子会")
     is_boss = fields.Boolean(string="董事会")
@@ -25,5 +26,23 @@ class IssueLibrary(models.Model):
     def issue_cancel(self):
         self.write({"statu": "cancel"})
 
-    def all_meting_issue(self):
-        self.write({"statu": "done"})
+    def all_meeting_issue(self):
+        for meet in self:
+            if meet.statu == 'done':
+                raise UserError('不可重复上会')
+            meet.write({"statu": "done"})
+        issue_active_ids = self.env["issue.library"].browse(self._context.get('active_ids', self._context.get('active_id')))
+        issue_library_data = [(0, 0, {'name': issue.name}) for issue in issue_active_ids]
+        form_id = self.env.ref("room.room_booking_view_form").id
+        return {
+            "type": "ir.actions.act_window",
+            "name": "会议安排",
+            "res_model": "room.booking",
+            "target": 'new',
+            "views": [[form_id, "form"]],
+            "context": {
+                'default_issue_room_booking_ids': issue_library_data,
+            }
+        }
+
+
diff --git a/yuthon_issue/views/issue_library_views.xml b/yuthon_issue/views/issue_library_views.xml
index 29e32b943..6cad6ed32 100644
--- a/yuthon_issue/views/issue_library_views.xml
+++ b/yuthon_issue/views/issue_library_views.xml
@@ -90,11 +90,11 @@
     </record>
 
     <record id="all_meting_issue" model="ir.actions.server">
-        <field name="name">上会</field>
+        <field name="name">批量上会</field>
         <field name="model_id" ref="yuthon_issue.model_issue_library"/>
         <field name="binding_model_id" ref="yuthon_issue.model_issue_library"/>
         <field name="state">code</field>
-        <field name="code">records.all_meting_issue()</field>
+        <field name="code">action = model.all_meeting_issue()</field>
     </record>
 
     <menuitem