combo获取值失败，把数据做成类

Author: 鸿濡

apps/db/db_engin.py

@@ -4,8 +4,7 @@
 from sqlalchemy import create_engine
 import platform
 import os
-from apps.project.project_models import ProjectBase
-from apps.staff.staff_models import UserBase, UserPorject
+from db_models import Base
 
 DB_NAME = "staff.db"
 
@@ -23,6 +22,4 @@
 engine = create_engine("sqlite:///%s/staff.db" % DB_PATH, echo=False)
 # 如果表不存在，则创建表
 if not os.path.exists(DB_FILE_PATH):
-    UserBase.metadata.create_all(engine)
-    ProjectBase.metadata.create_all(engine)
-    UserPorject.metadata.create_all(engine)
+    Base.metadata.create_all(engine)

apps/db/db_models.py

@@ -0,0 +1,48 @@
+#coding=cp936
+__author__ = 'admin'
+
+
+from sqlalchemy import Table, MetaData, Column, ForeignKey, Integer, String, Unicode, DateTime, create_engine
+from sqlalchemy.ext.declarative import declarative_base
+from sqlalchemy.orm import relationship, backref
+
+Base = declarative_base()
+
+class User(Base):
+    __tablename__ = 'users'
+
+    id = Column(Integer, primary_key=True)
+    name = Column(String)
+    employee_id = Column(String)
+    phone_number = Column(String)
+    tel_number = Column(String)
+    birth_date = Column(String)
+    title = Column(String)
+    position = Column(String)
+    education = Column(String)
+    userproject = relationship('UserProject')
+
+class Project(Base):
+    __tablename__ = 'projects'
+
+    id = Column(Integer, primary_key=True)
+    name = Column(String)
+    search_id = Column(String)
+    source_place = Column(String)
+    main_designer = Column(String)
+    design_all = Column(String)
+    responsible_man = Column(String)
+    start_time = Column(String)
+    end_time = Column(String)
+    attendee = Column(String)
+    userproject = relationship('UserProject')
+
+
+class UserProject(Base):
+    __tablename__ = 'users_projects'
+
+    id = Column(Integer, primary_key=True)
+    user_id = Column(Integer, ForeignKey('users.id'))
+    project_id = Column(Integer, ForeignKey('projects.id'))
+    #user = relationship("users", backref="users_projects")
+    #project = relationship("projects", backref="users_projects")

apps/device/device_models.py

@@ -1,9 +1,10 @@
 #coding=cp936
 __author__ = 'admin'
 
-from project_models import Project
+from apps.db.db_models import Project
 from apps.db.db_session import session
 from apps.utils.tools import ToolsManager
+from apps.staff.staff_manager import StaffManager
 
 class ProjectManager(object):
     @staticmethod
@@ -19,9 +20,7 @@ def add_project(user_obj):
 
     @staticmethod
     def delete_project(ids_list):
-        items = session.query(Project).filter(Project.id.in_(ids_list))
-        for item in items:
-            session.delete(item)
+        session.query(Project).filter(Project.id.in_(ids_list)).delete(synchronize_session=False)
         session.commit()
 
     @staticmethod
@@ -48,16 +47,18 @@ def search_project():
     def updata_project(dic):
         item = session.query(Project).filter(Project.id == dic.get('id')).one()
         item.name = dic.get('name')
-        item.search_id=dic.get('search_id')
-        item.source_place=dic.get('source_place')
-        item.main_designer=dic.get('main_designer')
-        item.design_all=dic.get('design_all')
-        item.responsible_man=dic.get('responsible_man')
-        item.attendee=dic.get('attendee')
-        item.start_time=dic.get('start_time')
-        item.end_time=dic.get('end_time')
+        item.search_id = dic.get('search_id')
+        item.source_place = dic.get('source_place')
+        item.main_designer = dic.get('main_designer')
+        item.design_all = dic.get('design_all')
+        item.responsible_man = dic.get('responsible_man')
+        item.attendee = dic.get('attendee')
+        item.start_time = dic.get('start_time')
+        item.end_time = dic.get('end_time')
         session.add(item)
         session.commit()
+        StaffManager.delete_staff_project_by_project_ids([item.id])
+        StaffManager.add_staff_project(item.id, dic.get('attendee_ids'))
 
     @staticmethod
     def get_one_item_by_id(item_id):

apps/graph/__init__.py

@@ -1,11 +1,13 @@
 #coding=cp936
 __author__ = 'admin'
 
+import copy
 from PyQt4 import QtGui, QtCore
-from project_models import Project
+from apps.db.db_models import Project
 from project_manager import ProjectManager
 from apps.utils.tools import ToolsManager
 from apps.staff.staff_manager import StaffManager
+from apps.utils import constant
 
 
 class project_tab(QtGui.QWidget):
@@ -53,7 +55,7 @@ class MyTable(QtGui.QTableWidget):
     def __init__(self,parent=None):
         super(MyTable,self).__init__(parent)
 
-        head_labels = [u'ID', u'工程名称',u'检索号',u'来源',u'主设人',u'设总',u'负责主工',u'参加人员',u'开始时间',u'结束时间',u'工程所用仪器']
+        head_labels = constant.PROJECT_COLUMN
         self.setColumnCount(len(head_labels))
         self.setRowCount(0)
         self.setHorizontalHeaderLabels(head_labels)
@@ -63,9 +65,11 @@ def add_project(self):
         dialog = Dialog()
         if dialog.exec_():
             dic = dialog.get_add_datas()
+            attendee_ids = copy.deepcopy(dic['attendee_ids'])
+            del dic['attendee_ids']
             user = Project(**dic)
             project = ProjectManager.add_project(user)
-            StaffManager.add_staff_project(project.id, dic['attendee'])
+            StaffManager.add_staff_project(project.id, attendee_ids)
             self.refresh_project()
         dialog.destroy()
 
@@ -81,8 +85,8 @@ def refresh_project(self):
             for meta in datas_meta:
                 newItem = QtGui.QTableWidgetItem(unicode(meta))
                 self.setItem(i,j,newItem)
-                j = j + 1
-            i = i + 1
+                j += 1
+            i += 1
 
     def delete_project(self):
         indexes = self.selectionModel().selectedRows()
@@ -96,6 +100,7 @@ def delete_project(self):
                     id_text = self.item(index.row(), 0).text()
                     ids_list.append(int(id_text))
                 ProjectManager.delete_project(ids_list)
+                StaffManager.delete_staff_project_by_project_ids(ids_list)
                 self.refresh_project()
             else:
                 pass
@@ -259,11 +264,17 @@ def get_add_datas(self):
         datas_dic['start_time'] = unicode(self.start_time_edit.text())
         datas_dic['end_time'] = unicode(self.end_time_edit.text())
         attendee_ids = ''
+        attendee_names = ''
         for row_num in range(self.listWidgetB.count()):
             row_text = unicode(self.listWidgetB.item(row_num).text())
-            staff_id = StaffManager.get_one_item_by_name(row_text).id
-            attendee_ids += str(staff_id)+","
-        datas_dic['attendee'] = attendee_ids.rstrip(',')
+            staff = StaffManager.get_one_item_by_name(row_text)
+            staff_id = staff.id
+            staff_name = staff.name
+            attendee_ids += str(staff_id) + ","
+            attendee_names += staff_name + ","
+
+        datas_dic['attendee_ids'] = attendee_ids.rstrip(',')
+        datas_dic['attendee'] = attendee_names.rstrip(',')
         return datas_dic
 
     def add_fun(self):

apps/graph/main_window.py renamed to apps/main_window.py

@@ -1,9 +1,10 @@
 #coding=cp936
 __author__ = 'admin'
 
-from staff_models import User, UserPorject
+from apps.db.db_models import User, UserProject
 from apps.db.db_session import session
 from apps.utils.tools import ToolsManager
+from sqlalchemy import and_, or_
 
 class StaffManager(object):
     @staticmethod
@@ -18,9 +19,7 @@ def add_staff(user_obj):
 
     @staticmethod
     def delete_staff(ids_list):
-        items = session.query(User).filter(User.id.in_(ids_list))
-        for item in items:
-            session.delete(item)
+        session.query(User).filter(User.id.in_(ids_list)).delete(synchronize_session=False)
         session.commit()
 
     @staticmethod
@@ -64,15 +63,30 @@ def get_one_item_by_name(item_name):
 
     @staticmethod
     def add_staff_project(project_id, attendee_ids_str):
-        attendee_ids_list = attendee_ids_str.split(',')
-        for id in attendee_ids_list:
-            item = UserPorject(user_id=id, project_id=project_id)
-            session.add(item)
+        if attendee_ids_str != '':
+            attendee_ids_list = attendee_ids_str.split(',')
+            for id in attendee_ids_list:
+                item = UserProject(user_id=id, project_id=project_id)
+                session.add(item)
+            session.commit()
+
+    @staticmethod
+    def delete_staff_project_by_project_ids(project_ids):
+        session.query(UserProject).filter(UserProject.project_id.in_(project_ids)).delete(synchronize_session=False)
         session.commit()
 
+    @staticmethod
+    def delete_staff_project_by_staff_ids(user_ids):
+        session.query(UserProject).filter(UserProject.user_id.in_(user_ids)).delete(synchronize_session=False)
+        session.commit()
+
+    @staticmethod
+    def delete_staff_project_by_staff_project_id(user_id, project_id):
+        session.query(UserProject).filter(and_(UserProject.user_id == user_id, UserProject.project_id == project_id)).delete()
+
     @staticmethod
     def search_staff_project(staff_name):
         staff_id = StaffManager.get_one_item_by_name(staff_name).id
-        items= session.query(UserPorject).filter(UserPorject.user_id == staff_id)
+        items= session.query(UserProject).filter(UserProject.user_id == staff_id).all()
         for item in items:
             print item.user_id, item.project_id