[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: branches/work/kbugbuster-isi/KBugBuster-v2/src
From: Gael Courcelle <gael.courcelle () laposte ! net>
Date: 2008-12-08 7:59:19
Message-ID: 1228723159.792553.5347.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 894208 by courcelle:
Update Bugs ...
M +8 -5 controller/BugController.py
M +3 -2 controller/FacadeController.py
M +23 -1 model/Bug.py
M +11 -13 model/DataBaseAccess.py
M +0 -5 view/BugsTableModel.py
M +9 -23 view/BugsTree.py
M +23 -5 view/CentralWidget.py
M +2 -0 view/Window.py
--- branches/work/kbugbuster-isi/KBugBuster-v2/src/controller/BugController.py \
#894207:894208 @@ -18,7 +18,9 @@
#############################################################################
from PyQt4.QtCore import QObject
+from PyQt4 import QtCore
from model.DataBaseAccess import DataBaseAccess
+from model.Bug import Bug
class BugController(QObject):
@@ -37,15 +39,16 @@
bug.setSeverity( values['severity'] )
bug.setPriority( values['priority'] )
bug.setHardware( values['hardware'] )
- bug.setDepends( values['depends'] )
- bug.setBlocks( values['blocks'] )
- bug.setCc( values['cc'] )
- bug.setUrl( values['url'] )
self.dbAccess.connect()
self.dbAccess.updateBug(bug)
self.dbAccess.disconnect()
-
+
+ self.window.searchDockWidget.widget().ui.treeView.model().emit(QtCore.SIGNAL('layoutChanged \
()')) +
+ def loadBug(self, bug):
+ self.window.centralWidget().loadBug(bug)
+
def searchBugById(self, idServer, idBug):
#TODO A REFAIRE AVEC RECHERCHE LOCALE
print "Pout toi MAX"
--- branches/work/kbugbuster-isi/KBugBuster-v2/src/controller/FacadeController.py \
#894207:894208 @@ -53,7 +53,8 @@
# BUG CONTROLLER
#
#self.connect(self.window,QtCore.SIGNAL("searchBug"), \
self.bugController.searchBug)
- #self.connect(self.window,QtCore.SIGNAL("editBug"), \
self.bugController.editBug) + \
self.connect(self.window.searchDockWidget,QtCore.SIGNAL("askEditBug"), \
self.bugController.loadBug) + \
self.connect(self.window.centralWidget(),QtCore.SIGNAL("editBug"), \
self.bugController.editBug)
#
# SEARCH CONTROLLER
@@ -84,7 +85,7 @@
def generateServerListFile(self, account):
fichier = open('./model/serverList','w')
- fichier.write("\t# WARNING! All changes made in this file will be lost!\n")
+ fichier.write("# WARNING! All changes made in this file will be lost!\n")
serverList = account.getServerList()
keysServerList = serverList.keys()
--- branches/work/kbugbuster-isi/KBugBuster-v2/src/model/Bug.py #894207:894208
@@ -20,7 +20,29 @@
class Bug:
def __init__(self,attributes):
- self.attributes = attributes
+ self.attributes = {}
+ self.attributes['id'] = attributes['id']
+ self.attributes['assignee'] = attributes['assignee']
+ self.attributes['status'] = attributes['status']
+ self.attributes['summary'] = attributes['summary']
+ self.attributes['alias'] = ""
+ #creation_time doit etre sous le format YYYYMMDD/HH:MM:SS
+ self.attributes['creation_time'] = ""
+ self.attributes['last_server_modif_time'] = ""
+ self.attributes['version'] = ""
+ self.attributes['priority'] = attributes['priority']
+ self.attributes['severity'] = ""
+ self.attributes['product_id'] = ""
+ self.attributes['reporter_id'] = ""
+ self.attributes['operating_system'] = attributes['operating_system']
+ self.attributes['hardware'] = ""
+ self.attributes['url'] = ""
+ self.attributes['depends'] = ""
+ self.attributes['blocks'] = ""
+ self.attributes['cc'] = ""
+ self.attributes['component'] = ""
+ self.attributes['resolution'] = ""
+ self.attributes['idServer'] = attributes['idServer']
def getId(self):
return self.attributes['id']
--- branches/work/kbugbuster-isi/KBugBuster-v2/src/model/DataBaseAccess.py \
#894207:894208 @@ -147,11 +147,10 @@
return 1
def updateBug(self, pbug):
- try:
self.connect()
request = """update bug set bAssigned='%s', bStatus='%s', bSummary='%s'
, bAlias='%s', bCreationTime='%s', bLastServerUpdateTime='%s', \
bVersion='%s',
- bPriority='%s', bSeverity='%s', bProduct='%s', bReporter='%s', bOs='%s' \
where bIdServer=%s""" %( + bPriority='%s', bSeverity='%s', bProduct='%s', \
bReporter='%s', bOs='%s' where bIdServer=%s and bId =%s""" %( \
str(pbug.getAssignee()), str(pbug.getStatus()),
str(pbug.getSummary()),
@@ -164,12 +163,11 @@
str(pbug.getProductId()),
str(pbug.getReporterId()),
str(pbug.getOperatingSystem()),
- str(pbug.getIdServer()))
+ str(pbug.getIdServer()),
+ str(pbug.getId()))
self.cursor.execute(request)
self.disconnect()
- return 0
- except:
- return 1
+
def getBug(self, pBugId):
@@ -197,15 +195,15 @@
self.disconnect()
- return Bug(bugAttributes)
- self.disconnect()
+ return bugAttributes
+
def getBugsBySearch(self, idSearch):
bugList = {}
bugAttributes = {}
- request = """SELECT bId, bStatus, bPriority
+ request = """SELECT bId, bStatus, bPriority, bSummary, bIdServer
FROM bug
WHERE
bIdServer IN (select sId from server where sId IN (select \
seIdServer from search search where seId = """+str(idSearch)+""")) @@ -223,7 +221,8 \
@@ bugAttributes['id'] = row[0]
bugAttributes['status'] = row[1]
bugAttributes['priority'] = row[2]
- bugAttributes['summary'] = ""
+ bugAttributes['summary'] = row[3]
+ bugAttributes['idServer'] = row[4]
bugAttributes['assignee'] = ""
bugAttributes['operating_system'] = ""
bugAttributes['severity'] = ""
@@ -318,9 +317,8 @@
values ('my3dSearch', 3, 1, 300, 'Status300', \
'Priority300')""")
c.execute("""insert into search (seName, seId, seIdServer, seIdBug, \
seStatus, sePriority)
values ('Search n1', 4, 2, '', '', '')""")
-
- request = """insert into bug (bId, bIdServer, bPriority, bStatus) values (
- 100, 1,'p100','s101')"""
+ request = """insert into bug (bId, bIdServer, bAssigned, bSummary, \
bOs,bSeverity, bPriority, bStatus) values ( + 100, 1,'Mr Cool', 'Big \
Bug', 'Vista','normal','P1','REOPENED')""" c.execute(request)
request = """insert into bug (bId, bIdServer, bPriority, bStatus) values (
200, 1,'p200','s201')"""
--- branches/work/kbugbuster-isi/KBugBuster-v2/src/view/BugsTableModel.py \
#894207:894208 @@ -45,11 +45,6 @@
self.nbColumn = len(self.header)
self.nbRow = len(self.bugs)
- def setBugList(self, bugList):
- self.bugs = bugList
- self.nbRow = len(self.bugs)
- #self.emit(QtCore.SIGNAL('dataChanged(const QModelIndex &, ''const \
QModelIndex &)'), self.index(0,0), self.index(2, 2))
-
def rowCount(self, ind = QModelIndex()):
if ind.isValid() == True:
return 0
--- branches/work/kbugbuster-isi/KBugBuster-v2/src/view/BugsTree.py #894207:894208
@@ -38,38 +38,24 @@
self.ui.setupUi(self)
- bugList = {}
+ self.bugList = {}
- #Just for test the design:
- #attributes = {}
- #attributes['id'] = "69"
- #attributes['severity'] = "Severity"
- #attributes['priority'] = "PX"
- #attributes['status'] = ""
- #attributes['assignee'] = ""
- #attributes['operating_system'] = ""
- #attributes['summary'] = "Big problem : Vista"
+ self.model = BugsTableModel(self.bugList)
-
- #bugList[0] = Bug(attributes)
-
- #attributes2 = attributes.copy()
- #attributes2['id'] = "99"
-
- #bugList[1] = Bug(attributes2)
-
- self.model = BugsTableModel(bugList)
-
self.ui.treeView.setModel(self.model)
self.ui.treeView.header().setSectionHidden(0, True)
self.connect(self.ui.treeView, QtCore.SIGNAL("doubleClicked (const \
QModelIndex&)"), self.doubleClikOnBugsTree)
def doubleClikOnBugsTree(self, index):
- bugId = self.model.data(self.model.index(index.row(), 1)).toString()
- print "Ask to load the bug : " + bugId
- self.emit(QtCore.SIGNAL("askEditBug"), bugId)
+ bugId = int(self.model.data(self.model.index(index.row(), 1)).toString())
+ for bugTmp in self.bugList:
+ if (self.bugList[bugTmp].getId() == bugId):
+ bug = self.bugList[bugTmp]
+ break
+ self.parent().emit(QtCore.SIGNAL("askEditBug"), bug)
def setModel(self, bugList):
+ self.bugList = bugList
self.model = BugsTableModel(bugList)
self.ui.treeView.setModel(self.model)
\ No newline at end of file
--- branches/work/kbugbuster-isi/KBugBuster-v2/src/view/CentralWidget.py \
#894207:894208 @@ -34,11 +34,29 @@
#
self.ui = Ui_CentralWidget()
self.ui.setupUi(self)
+ self.bug = None
+ self.connect(self.ui.saveButton, QtCore.SIGNAL("clicked()"), \
self.saveChanges)
- #TODO Move into Controller
- self.connect(self.parent().searchTree, QtCore.SIGNAL("askEditBug"), \
self.changeBug) + def loadBug(self, bug):
- def changeBug(self, bugId):
- self.ui.bugLabel.setText("Bug #" + bugId)
+ self.bug = bug
+
+ self.ui.bugLabel.setText("Bug <a href url=''>#" + str(bug.getId())+"</a>")
+
+ self.ui.summaryKLineEdit.setText(str(bug.getSummary()))
+
+ self.ui.statusComboBox.setCurrentItem(bug.getStatus())
+ self.ui.severityComboBox.setCurrentItem( str(bug.getSeverity() ))
+ self.ui.priorityComboBox.setCurrentItem( bug.getPriority() )
+
self.setDisabled(False)
-
\ No newline at end of file
+
+ def saveChanges(self):
+ newValues = {}
+ newValues['status'] = self.ui.statusComboBox.currentText()
+ newValues['summary'] = self.ui.summaryKLineEdit.text()
+ newValues['severity'] = self.ui.severityComboBox.currentText()
+ newValues['priority'] = self.ui.priorityComboBox.currentText()
+ newValues['hardware'] = self.ui.hardwareComboBox.currentText()
+
+ self.emit(QtCore.SIGNAL("editBug"), newValues, self.bug)
\ No newline at end of file
--- branches/work/kbugbuster-isi/KBugBuster-v2/src/view/Window.py #894207:894208
@@ -93,6 +93,8 @@
self.connect(newSearch, QtCore.SIGNAL("activated()"), self.askNewSearch) \
self.setupGUI()
+
+
def askAddServer(self):
self.emit(QtCore.SIGNAL("addServer"))
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic