From 8986ddbf0aa19aac7173fc31bb0f267db24bb7eb Mon Sep 17 00:00:00 2001 From: smbaker Date: Tue, 30 Aug 2011 14:58:59 -0700 Subject: [PATCH 1/1] remove roles from user screen, and ignore slice PIs --- sface/screens/userscreen.py | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/sface/screens/userscreen.py b/sface/screens/userscreen.py index 7745d59..bcb87f0 100644 --- a/sface/screens/userscreen.py +++ b/sface/screens/userscreen.py @@ -11,9 +11,9 @@ from sface.sfiprocess import SfiProcess from sface.screens.sfascreen import SfaScreen NAME_COLUMN = 0 -ROLE_COLUMN = 1 -MEMBERSHIP_STATUS_COLUMN = 2 -SERVER_MEMBERSHIP_STATUS_COLUMN = 3 +#ROLE_COLUMN = 1 +MEMBERSHIP_STATUS_COLUMN = 1 +SERVER_MEMBERSHIP_STATUS_COLUMN = 2 user_status = { "in": "Already Selected", "out": "Not Selected", @@ -219,12 +219,13 @@ class UsersWidget(QWidget): added_persons = [] slice_persons = [] - for pi in sliceRec.get_field("PI"): - name = str(pi) - if not name in added_persons: - slice_persons.append({"name": name, "role": "PI", "member": user_status["in"]}) - added_persons.append(name) - for researcher in sliceRec.get_field("researcher"): + #for pi in sliceRec.get_field("PI", default=[]): + # name = str(pi) + # if not name in added_persons: + # slice_persons.append({"name": name, "role": "PI", "member": user_status["in"]}) + # added_persons.append(name) + + for researcher in sliceRec.get_field("researcher", default=[]): name = str(researcher) if not name in added_persons: slice_persons.append({"name": name, "role": "researcher", "member": user_status["in"]}) @@ -244,11 +245,11 @@ class UsersWidget(QWidget): for person in slice_persons: rootItem.appendRow([QStandardItem(QString(person["name"])), - QStandardItem(QString(person["role"])), + #QStandardItem(QString(person["role"])), QStandardItem(QString(person["member"])), QStandardItem(QString(person["member"]))]) - headers = QStringList() << "User Name" << "Role" << "Status" << "ServerStatus" + headers = QStringList() << "User Name" << "Status" << "ServerStatus" self.userModel.setHorizontalHeaderLabels(headers) def updateView(self): -- 2.43.0