瀏覽代碼

add status for action to do + clean code debug messages

damien 11 年之前
父節點
當前提交
b96d41b4f7
共有 1 個文件被更改,包括 5 次插入18 次删除
  1. 5 18
      pboard/pboard/model/data.py

+ 5 - 18
pboard/pboard/model/data.py 查看文件

85
     
85
     
86
   StatusList = dict()
86
   StatusList = dict()
87
   StatusList['immortal']   = PBNodeStatusItem('immortal',   'Information', 'normal', 'icon-g-circle-info',            'pod-status-grey-light')
87
   StatusList['immortal']   = PBNodeStatusItem('immortal',   'Information', 'normal', 'icon-g-circle-info',            'pod-status-grey-light')
88
-  StatusList['new']        = PBNodeStatusItem('new',        'New',         'open',   'icon-g-lightbulb icon-g-white', 'btn-info')
89
-  StatusList['inprogress'] = PBNodeStatusItem('inprogress', 'In progress', 'open',   ' icon-g-roundabout icon-g-white', 'btn-success')
90
-  StatusList['standby']    = PBNodeStatusItem('standby',    'In Standby',  'open',   'icon-g-clock icon-g-white', 'btn-warning')
88
+  StatusList['new']        = PBNodeStatusItem('new',        'New',         'open',   'icon-g-lightbulb icon-g-white', 'btn-success')
89
+  StatusList['inprogress'] = PBNodeStatusItem('inprogress', 'In progress', 'open',   ' icon-g-roundabout icon-g-white', 'btn-info')
90
+  StatusList['actiontodo'] = PBNodeStatusItem('actiontodo', 'Waiting for action',       'open',   'icon-g-clock icon-g-white', 'btn-info')
91
+  StatusList['standby']    = PBNodeStatusItem('standby',    'Waiting for answer',  'open',   'icon-g-clock icon-g-white', 'btn-warning')
91
   StatusList['hot']        = PBNodeStatusItem('hot',        'Hot',         'open',   'icon-g-warning-sign icon-g-white', 'btn-danger')
92
   StatusList['hot']        = PBNodeStatusItem('hot',        'Hot',         'open',   'icon-g-warning-sign icon-g-white', 'btn-danger')
92
   StatusList['done']       = PBNodeStatusItem('done',       'Done',        'closed', 'icon-g-ok-2', 'pod-status-grey-light')
93
   StatusList['done']       = PBNodeStatusItem('done',       'Done',        'closed', 'icon-g-ok-2', 'pod-status-grey-light')
93
   StatusList['closed']     = PBNodeStatusItem('closed',     'Closed',      'closed', 'icon-g-lightbulb', 'pod-status-grey-middle')
94
   StatusList['closed']     = PBNodeStatusItem('closed',     'Closed',      'closed', 'icon-g-lightbulb', 'pod-status-grey-middle')
99
     return [
100
     return [
100
       PBNodeStatus.StatusList['immortal'],
101
       PBNodeStatus.StatusList['immortal'],
101
       PBNodeStatus.StatusList['new'],
102
       PBNodeStatus.StatusList['new'],
103
+      PBNodeStatus.StatusList['actiontodo'],
102
       PBNodeStatus.StatusList['inprogress'],
104
       PBNodeStatus.StatusList['inprogress'],
103
       PBNodeStatus.StatusList['standby'],
105
       PBNodeStatus.StatusList['standby'],
104
       PBNodeStatus.StatusList['hot'],
106
       PBNodeStatus.StatusList['hot'],
112
     
114
     
113
   @classmethod
115
   @classmethod
114
   def getStatusItem(cls, psStatusId):
116
   def getStatusItem(cls, psStatusId):
115
-    print "====> ID=", psStatusId
116
-    print "====> ITEM=", PBNodeStatus.StatusList[psStatusId]
117
     return PBNodeStatus.StatusList[psStatusId]
117
     return PBNodeStatus.StatusList[psStatusId]
118
 
118
 
119
 class PBNodeType(object):
119
 class PBNodeType(object):
130
 
130
 
131
   def getChildrenOfType(self, plNodeTypeList, plSortingCriteria):
131
   def getChildrenOfType(self, plNodeTypeList, plSortingCriteria):
132
     """return all children nodes of type 'data' or 'node' or 'folder'"""
132
     """return all children nodes of type 'data' or 'node' or 'folder'"""
133
-    print "NODE = ", self.node_id
134
-    print "######"
135
-    print plNodeTypeList
136
-    print "######"
137
-    print "######"
138
-    
139
     return DBSession.query(PBNode).filter(PBNode.parent_id==self.node_id).filter(PBNode.node_type.in_(plNodeTypeList)).order_by(plSortingCriteria).all()
133
     return DBSession.query(PBNode).filter(PBNode.parent_id==self.node_id).filter(PBNode.node_type.in_(plNodeTypeList)).order_by(plSortingCriteria).all()
140
   
134
   
141
   
135
   
142
   def getChildNb(self):
136
   def getChildNb(self):
143
     liChildNb = DBSession.query(PBNode).filter(PBNode.parent_id==self.node_id).filter(PBNode.node_type==PBNodeType.Data).count()
137
     liChildNb = DBSession.query(PBNode).filter(PBNode.parent_id==self.node_id).filter(PBNode.node_type==PBNodeType.Data).count()
144
-    print "CHILDREN of ", self.node_id, " are ", liChildNb
145
     return liChildNb
138
     return liChildNb
146
 
139
 
147
   def getChildren(self):
140
   def getChildren(self):
153
     return self.getChildrenOfType([PBNodeType.Contact], PBNode.data_label.asc())
146
     return self.getChildrenOfType([PBNodeType.Contact], PBNode.data_label.asc())
154
 
147
 
155
   def getEvents(self):
148
   def getEvents(self):
156
-    """print "---------------------------"
157
-    print self.getChildrenOfType((PBNodeType.Event,), PBNode.data_datetime.desc())
158
-    print "---------------------------"
159
-    print "---------------------------"
160
-    return self.getChildrenOfType((PBNodeType.Event,), PBNode.data_datetime.desc())
161
-    """
162
     return DBSession.query(PBNode).filter(PBNode.parent_id==self.node_id).filter(PBNode.node_type==PBNodeType.Event).order_by(PBNode.data_datetime.desc()).all()
149
     return DBSession.query(PBNode).filter(PBNode.parent_id==self.node_id).filter(PBNode.node_type==PBNodeType.Event).order_by(PBNode.data_datetime.desc()).all()
163
     return []
150
     return []
164
     
151