浏览代码

[ADD]新增model/hostel_room.py,新增对应视图, 使用static/description/icon.png代替默认图标

Your Name 1 月之前
父节点
当前提交
a74dfda082
共有 10 个文件被更改,包括 86 次插入15 次删除
  1. 2 1
      __manifest__.py
  2. 7 3
      data/data.xml
  3. 2 1
      models/__init__.py
  4. 15 3
      models/hostel.py
  5. 11 0
      models/hostel_room.py
  6. 0 0
      static/description/icon.png
  7. 47 0
      views/hostel_room_views.xml
  8. 1 1
      views/hostel_views.xml
  9. 1 1
      wizards/__init__.py
  10. 0 5
      wizards/hostel_room.py

+ 2 - 1
__manifest__.py

@@ -7,12 +7,13 @@
     "category": "Uncategorized",
     "version": "17.0.1.0.0",
     "depends": ["base"],
-    "images": ["static/description/output.png"],
+    "images": ["static/description/icon.png"],
     "data": [
         "security/res.groups.xml",
         "security/ir.model.access.csv",
         "views/parent.menus.xml",
         "views/hostel_views.xml",
+        "views/hostel_room_views.xml"
     ],
     "assets": {
         "web.assets_backend": [

+ 7 - 3
data/data.xml

@@ -1,4 +1,8 @@
-<record forcerewrite="True" id="hostel.hostel_view_form" model="ir.ui.view">
-<field name="name">Rating Value</field>
-<field name="digits">3</field>
+<!--<record forcerewrite="True" id="hostel.hostel_view_form" model="ir.ui.view">-->
+<!--<field name="name">Rating Value</field>-->
+<!--<field name="digits">3</field>-->
+<!--</record>-->
+<record forcecreate="True" id="decimal_point" model="decimal.precision">
+    <field name="Name">Rating Value</field>
+    <field name="digits">3</field>
 </record>

+ 2 - 1
models/__init__.py

@@ -1 +1,2 @@
-from . import hostel
+from . import hostel
+from . import hostel_room

+ 15 - 3
models/hostel.py

@@ -10,7 +10,7 @@ class Hostel(models.Model):
     currency_id = fields.Many2one('res.currency', string='Currency')
 
     # _table = 'hostel_hostel'
-    
+    custom_domain = "hostel_code"
     name = fields.Char(string='宿舍名称', required=True)
     hostel_code = fields.Char(string='代码', required=True)
     street = fields.Char('街道')
@@ -24,7 +24,7 @@ class Hostel(models.Model):
     email = fields.Char('邮箱')
     hostel_floors = fields.Integer(string="楼层")
     image = fields.Binary("宿舍图片")
-    activate = fields.Boolean(string="激活", default=True, help="激活 / 停用宿舍记录")
+    active = fields.Boolean(string="可用", default=True, help="激活/停用 宿舍记录")
     type = fields.Selection(
         string="类型",
         selection=[("男性", "男生宿舍"), ("女性", "女生宿舍"), ("混合", "混合宿舍")],
@@ -35,6 +35,7 @@ class Hostel(models.Model):
     other_info = fields.Text(string="其他信息", help="输入更多信息")
     description = fields.Html(string="描述")
     hostel_rating = fields.Float('宿舍平均排名', digits="rating value")
+    company_dependent = fields.Boolean(string="公司依赖", default=True)
 
     @api.depends('hostel_code')
     def _compute_display_name(self):
@@ -53,4 +54,15 @@ class Hostel(models.Model):
             elif record.hostel_floors > 50:
                 # record.hostel_floors = 50
                 raise models.ValidationError("楼层数不能超过50层")
-                # record.message_post(body="楼层数不能超过50层")
+                # record.message_post(body="楼层数不能超过50层")
+
+    # 此函数用于在当前字段分组时扩展read_group结果
+    # @api.model
+    # def _read_group_selection_field(self, values, domain, order):
+    #     return ["choice1", "choice2"]
+
+    # 此函数也用于在当前字段分组时扩展read_group结果
+    # @api.model
+    # def _read_group_many2one_field(self, records, domain, order):
+    #     return records + self.search([custom_domain])
+

+ 11 - 0
models/hostel_room.py

@@ -0,0 +1,11 @@
+from odoo import models, fields, api
+
+class HostelRoom(models.Model):
+    _name = "hostel.room"
+    _description = "宿舍房间信息"
+    floor_number = fields.Integer("楼层", required=True)
+    room_name = fields.Char("房间名称", required=True)
+    room_id = fields.Integer("房间编号", required=True)
+    rent_amount = fields.Monetary("租金", help="输入每月租金", currency_field="currency_id")
+    currency_id = fields.Many2one('res.currency', string="货币种类")
+

static/description/output.png → static/description/icon.png


+ 47 - 0
views/hostel_room_views.xml

@@ -0,0 +1,47 @@
+<odoo>
+    <data>
+        <record id="hostel_room_view_form" model="ir.ui.view">
+            <field name="name">宿舍房间表单</field>
+            <field name="model">hostel.room</field>
+            <field name="arch" type="xml">
+                <form string="宿舍房间表单">
+                    <group>
+                        <field name="room_name" string="房间名字" required="True"/>
+                        <field name="room_id" string="房间编号" required="True"/>
+                        <field name="floor_number" string="房间楼层" required="True"/>
+                        <field name="rent_amount" string="租金" required="True" currency_field="currency_id"/>
+                        <field name="currency_id" string="货币种类" required="True"/>
+                    </group>
+                </form>
+            </field>
+        </record>
+        
+        <!-- 添加tree视图 -->
+<!--        <record id="hostel_room_view_tree" model="ir.ui.view">-->
+<!--&lt;!&ndash;            <field name="name">宿舍房间列表</field>&ndash;&gt;-->
+<!--            <field name="model">hostel.room</field>-->
+<!--            <field name="arch" type="xml">-->
+<!--                <tree>-->
+<!--                    <field name="room_name"/>-->
+<!--                    <field name="room_id"/>-->
+<!--                    <field name="floor_number"/>-->
+<!--                    <field name="rent_amount" currency_field="currency_id"/>-->
+<!--                    <field name="currency_id" invisible="1"/>-->
+<!--                </tree>-->
+<!--            </field>-->
+<!--        </record>-->
+        
+        <!-- 添加action -->
+        <record id="action_hostel_room" model="ir.actions.act_window">
+            <field name="name">宿舍房间</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">hostel.room</field>
+            <field name="view_mode">tree,form</field>
+            <field name="help" type="html">
+                <p class="oe_view_nocontent_create">
+                    创建宿舍房间.
+                </p>
+            </field>
+        </record>
+    </data>
+</odoo>

+ 1 - 1
views/hostel_views.xml

@@ -38,7 +38,7 @@
                             </group>
                             <group>
                                 <field name="hostel_floors" string="楼层"/>
-                                <field name="activate" string="激活"/>
+                                <field name="active" string="可用"/>
                                 <field name="type" string="类型"/>
                                 <field name="other_info" string="其他信息"/>
                             </group>

+ 1 - 1
wizards/__init__.py

@@ -1 +1 @@
-from . import hostel_room
+# from . import hostel_room

+ 0 - 5
wizards/hostel_room.py

@@ -31,8 +31,3 @@ class TempClean(models.TransientModel):
     @api.model
     def _is_clean(self):
         return []
-
-
-
-
-