Renamed id's to id_

Implementace/controllers/groups_overview_controller.py

 from PyQt5.QtCore import *
 from PyQt5.QtWidgets import *
-
 from model.member import Member
 from utils.members_table import MembersTable
 from windows import groupsoverview
@@ -50,4 +49,4 @@ class GroupsOverview(QWidget, groupsoverview.Ui_Form):
     @pyqtSlot(Member)
     def editMember(self, person):
-        print(person.id)
+        print(person.id_)

Implementace/controllers/mainwindow_controller.py

@@ -2,7 +2,7 @@ from PyQt5 import QtWidgets as Qt
 from PyQt5.QtCore import pyqtSlot
 from controllers.distribution_overview_controller import DistributionOverview
-from controllers.distribution_setup import DistributionSetup
+from controllers.distribution_setup_controller import DistributionSetup
 from controllers.group_edit_controller import GroupEdit
 from controllers.groups_overview_controller import GroupsOverview
 from globals import Global
@@ -14,8 +14,8 @@ class MainWindow(Qt.QMainWindow, mainwindow.Ui_MainWindow):
         super(MainWindow, self).__init__(parent)
         self.setupUi(self)
         self.btnBack.clicked.connect(self.goBack)
-        # self.goToGroupsOverview()
-        self.goToDistributionOverview()
+        self.goToGroupsOverview()
+        #self.goToDistributionOverview()
         self._last_changed = 0
     def _goToWidget(self, widget):

Implementace/model/group.py

@@ -6,11 +6,11 @@ class Group:
     MIN_LENGTH = 3
     MAX_LENGTH = 25
-    def __init__(self, id, name=''):
+    def __init__(self, id_, name=''):
         if id == self.NEW_GROUP:
-            self.id, self.name = Global.db.createNewGroup()
+            self.id_, self.name = Global.db.createNewGroup()
         else:
-            self.id = id
+            self.id_ = id_
             self.name = name
         self._members = None
@@ -22,7 +22,7 @@ class Group:
     @property
     def members(self):
         if self._members is None:
-            self._members = Global.db.getGroupMembers(self.id)
+            self._members = Global.db.getGroupMembers(self.id_)
         return self._members
     @property
@@ -35,7 +35,7 @@ class Group:
         return len(self._members)
     def delete(self):
-        Global.db.deleteGroup(self.id)
+        Global.db.deleteGroup(self.id_)
     def changeName(self, new_name):
         if new_name == self.name:
@@ -45,7 +45,7 @@ class Group:
         if len(new_name) > self.MAX_LENGTH:
             raise ValueError("Jméno skupiny nesmí být delší než " + str(self.MAX_LENGTH) + " znaků.")
         if Global.db.getGroupByName(new_name) is None:
-            Global.db.changeGroupName(self.id, new_name)
+            Global.db.changeGroupName(self.id_, new_name)
             self.name = new_name
         else:
             raise ValueError("Skupina se jménem '" + new_name + "' již existuje.")
@@ -59,4 +59,4 @@ class Group:
         """
         # force initialization of members
         self.members
-        self._members.append(Global.db.createMember(self.id, name, surname))
+        self._members.append(Global.db.createMember(self.id_, name, surname))

Implementace/utils/qtmodels/groups_table_model.py

@@ -29,4 +29,4 @@ class GroupsTableModel(QtCore.QAbstractTableModel):
     # returns instance of Group with given group_id or None if not found in collection
     def getElementById(self, group_id):
-        return next((group for group in self._groups if group.id == int(group_id)), None)
\ No newline at end of file
+        return next((group for group in self._groups if group.id_ == int(group_id)), None)
\ No newline at end of file

Implementace/utils/qtmodels/members_table_model.py

@@ -32,4 +32,4 @@ class MembersTableModel(QtCore.QAbstractTableModel):
             return person
     def getElementById(self, person_id):
-        return next((person for person in self._people if person.id == int(person_id)), None)
+        return next((person for person in self._people if person.id_ == int(person_id)), None)

Implementace/utils/table.py

@@ -42,7 +42,7 @@ class ElemTable(QWidget, table.Ui_Form):
                 button = QPushButton(self._btn_titles[btn_nr])
                 button.clicked.connect(self.onBtnClicked)
                 item = self.model.data(self.model.index(i, 0), Qt.UserRole)
-                button.setObjectName(str(item.id) + "_" + str(btn_nr))
+                button.setObjectName(str(item.id_) + "_" + str(btn_nr))
                 self.table.setIndexWidget(self.model.index(i, btn_nr+self._data_columns), button)
     def onBtnClicked(self):

Implementace/windows/qt/qt.pro.user

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.2.1, 2017-04-08T15:55:15. -->
+<!-- Written by QtCreator 4.2.1, 2017-04-08T19:41:06. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>