\o/

2015-02-07 23:59:01 +01:00
parent b7b6a84643
commit e92819cbb7
25 changed files with 879 additions and 597 deletions
--- a/ui/main.py
+++ b/ui/main.py
@ -2,7 +2,7 @@

 # Form implementation generated from reading ui file 'main.ui'
 #
-# Created: Thu Jan 22 09:11:44 2015
+# Created: Sat Feb  7 23:25:05 2015
 #      by: PyQt4 UI code generator 4.11.3
 #
 # WARNING! All changes made in this file will be lost!
@ -30,15 +30,12 @@ class Ui_MainWindow(object):
        self.centralwidget = QtGui.QWidget(MainWindow)
        self.centralwidget.setObjectName(_fromUtf8("centralwidget"))
        self.tabWidget = QtGui.QTabWidget(self.centralwidget)
-        self.tabWidget.setGeometry(QtCore.QRect(20, 40, 561, 501))
+        self.tabWidget.setGeometry(QtCore.QRect(10, 40, 561, 501))
        self.tabWidget.setObjectName(_fromUtf8("tabWidget"))
        self.tab = QtGui.QWidget()
        self.tab.setObjectName(_fromUtf8("tab"))
-        self.label = QtGui.QLabel(self.tab)
-        self.label.setGeometry(QtCore.QRect(40, 10, 61, 15))
-        self.label.setObjectName(_fromUtf8("label"))
        self.listWidget = QtGui.QListWidget(self.tab)
-        self.listWidget.setGeometry(QtCore.QRect(60, 50, 431, 261))
+        self.listWidget.setGeometry(QtCore.QRect(10, 10, 531, 451))
        self.listWidget.setObjectName(_fromUtf8("listWidget"))
        self.tabWidget.addTab(self.tab, _fromUtf8(""))
        self.tab_2 = QtGui.QWidget()
@ -110,26 +107,60 @@ class Ui_MainWindow(object):
        self.btn_effectuer_entretien.setGeometry(QtCore.QRect(326, 60, 161, 27))
        self.btn_effectuer_entretien.setObjectName(_fromUtf8("btn_effectuer_entretien"))
        self.groupBox_3 = QtGui.QGroupBox(self.tab_3)
-        self.groupBox_3.setGeometry(QtCore.QRect(30, 290, 511, 111))
+        self.groupBox_3.setGeometry(QtCore.QRect(30, 290, 511, 171))
        self.groupBox_3.setObjectName(_fromUtf8("groupBox_3"))
        self.comboBox_livraison = QtGui.QComboBox(self.groupBox_3)
        self.comboBox_livraison.setGeometry(QtCore.QRect(10, 20, 481, 27))
        self.comboBox_livraison.setObjectName(_fromUtf8("comboBox_livraison"))
        self.btn_effectuer_livraison = QtGui.QPushButton(self.groupBox_3)
-        self.btn_effectuer_livraison.setGeometry(QtCore.QRect(326, 70, 161, 27))
+        self.btn_effectuer_livraison.setGeometry(QtCore.QRect(320, 120, 161, 27))
        self.btn_effectuer_livraison.setObjectName(_fromUtf8("btn_effectuer_livraison"))
+        self.dateTimeEdit = QtGui.QDateTimeEdit(self.groupBox_3)
+        self.dateTimeEdit.setGeometry(QtCore.QRect(290, 70, 194, 23))
+        self.dateTimeEdit.setObjectName(_fromUtf8("dateTimeEdit"))
+        self.formLayoutWidget = QtGui.QWidget(self.groupBox_3)
+        self.formLayoutWidget.setGeometry(QtCore.QRect(20, 70, 261, 31))
+        self.formLayoutWidget.setObjectName(_fromUtf8("formLayoutWidget"))
+        self.formLayout = QtGui.QFormLayout(self.formLayoutWidget)
+        self.formLayout.setFieldGrowthPolicy(QtGui.QFormLayout.AllNonFixedFieldsGrow)
+        self.formLayout.setMargin(0)
+        self.formLayout.setObjectName(_fromUtf8("formLayout"))
+        self.lieuLabel = QtGui.QLabel(self.formLayoutWidget)
+        self.lieuLabel.setObjectName(_fromUtf8("lieuLabel"))
+        self.formLayout.setWidget(0, QtGui.QFormLayout.LabelRole, self.lieuLabel)
+        self.lieuLineEdit = QtGui.QLineEdit(self.formLayoutWidget)
+        self.lieuLineEdit.setObjectName(_fromUtf8("lieuLineEdit"))
+        self.formLayout.setWidget(0, QtGui.QFormLayout.FieldRole, self.lieuLineEdit)
+        self.btn_modif_livraison = QtGui.QPushButton(self.groupBox_3)
+        self.btn_modif_livraison.setGeometry(QtCore.QRect(136, 120, 141, 27))
+        self.btn_modif_livraison.setObjectName(_fromUtf8("btn_modif_livraison"))
        self.tabWidget.addTab(self.tab_3, _fromUtf8(""))
        self.tab_4 = QtGui.QWidget()
        self.tab_4.setObjectName(_fromUtf8("tab_4"))
-        self.label_2 = QtGui.QLabel(self.tab_4)
-        self.label_2.setGeometry(QtCore.QRect(40, 80, 161, 16))
+        self.formLayoutWidget_2 = QtGui.QWidget(self.tab_4)
+        self.formLayoutWidget_2.setGeometry(QtCore.QRect(60, 40, 461, 181))
+        self.formLayoutWidget_2.setObjectName(_fromUtf8("formLayoutWidget_2"))
+        self.formLayout_2 = QtGui.QFormLayout(self.formLayoutWidget_2)
+        self.formLayout_2.setMargin(0)
+        self.formLayout_2.setObjectName(_fromUtf8("formLayout_2"))
+        self.nombreAbonnLabel = QtGui.QLabel(self.formLayoutWidget_2)
+        self.nombreAbonnLabel.setObjectName(_fromUtf8("nombreAbonnLabel"))
+        self.formLayout_2.setWidget(0, QtGui.QFormLayout.LabelRole, self.nombreAbonnLabel)
+        self.labelNbAbo = QtGui.QLabel(self.formLayoutWidget_2)
+        self.labelNbAbo.setObjectName(_fromUtf8("labelNbAbo"))
+        self.formLayout_2.setWidget(0, QtGui.QFormLayout.FieldRole, self.labelNbAbo)
+        self.label_2 = QtGui.QLabel(self.formLayoutWidget_2)
        self.label_2.setObjectName(_fromUtf8("label_2"))
-        self.label_3 = QtGui.QLabel(self.tab_4)
-        self.label_3.setGeometry(QtCore.QRect(40, 110, 161, 16))
-        self.label_3.setObjectName(_fromUtf8("label_3"))
-        self.label_4 = QtGui.QLabel(self.tab_4)
-        self.label_4.setGeometry(QtCore.QRect(40, 140, 241, 16))
+        self.formLayout_2.setWidget(2, QtGui.QFormLayout.LabelRole, self.label_2)
+        self.labelNbSuperAbo = QtGui.QLabel(self.formLayoutWidget_2)
+        self.labelNbSuperAbo.setObjectName(_fromUtf8("labelNbSuperAbo"))
+        self.formLayout_2.setWidget(2, QtGui.QFormLayout.FieldRole, self.labelNbSuperAbo)
+        self.label_4 = QtGui.QLabel(self.formLayoutWidget_2)
        self.label_4.setObjectName(_fromUtf8("label_4"))
+        self.formLayout_2.setWidget(3, QtGui.QFormLayout.LabelRole, self.label_4)
+        self.labelMoySta = QtGui.QLabel(self.formLayoutWidget_2)
+        self.labelMoySta.setObjectName(_fromUtf8("labelMoySta"))
+        self.formLayout_2.setWidget(3, QtGui.QFormLayout.FieldRole, self.labelMoySta)
        self.tabWidget.addTab(self.tab_4, _fromUtf8(""))
        self.comboBox = QtGui.QComboBox(self.centralwidget)
        self.comboBox.setGeometry(QtCore.QRect(40, 10, 539, 27))
@ -166,8 +197,8 @@ class Ui_MainWindow(object):
        self.action.setObjectName(_fromUtf8("action"))
        self.actionNouveau_2 = QtGui.QAction(MainWindow)
        self.actionNouveau_2.setObjectName(_fromUtf8("actionNouveau_2"))
-        self.menuFichier.addAction(self.actionCharger)
        self.menuFichier.addAction(self.actionNouveau_2)
+        self.menuFichier.addAction(self.actionCharger)
        self.menuFichier.addAction(self.actionSauvegarder)
        self.menuFichier.addSeparator()
        self.menuFichier.addAction(self.actionQuitter)
@ -176,12 +207,11 @@ class Ui_MainWindow(object):
        self.menubar.addAction(self.menuA_propos.menuAction())

        self.retranslateUi(MainWindow)
-        self.tabWidget.setCurrentIndex(2)
+        self.tabWidget.setCurrentIndex(3)
        QtCore.QMetaObject.connectSlotsByName(MainWindow)

    def retranslateUi(self, MainWindow):
        MainWindow.setWindowTitle(_translate("MainWindow", "Administration", None))
-        self.label.setText(_translate("MainWindow", "Activité :", None))
        self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab), _translate("MainWindow", "Activite", None))
        self.label_13.setText(_translate("MainWindow", "Nom :", None))
        self.nom.setText(_translate("MainWindow", "TextLabel", None))
@ -189,7 +219,7 @@ class Ui_MainWindow(object):
        self.placesParNiveau.setText(_translate("MainWindow", "TextLabel", None))
        self.label_16.setText(_translate("MainWindow", "Places disponible :", None))
        self.placesDispo.setText(_translate("MainWindow", "TextLabel", None))
-        self.label_17.setText(_translate("MainWindow", "Places Reserve Super Abo : ", None))
+        self.label_17.setText(_translate("MainWindow", "Places Super Abo : ", None))
        self.placesSuperAbo.setText(_translate("MainWindow", "TextLabel", None))
        self.btn_details.setText(_translate("MainWindow", "Details Places", None))
        self.btn_borne.setText(_translate("MainWindow", "Borne", None))
@ -202,10 +232,15 @@ class Ui_MainWindow(object):
        self.btn_effectuer_entretien.setText(_translate("MainWindow", "Effectuer Entretien", None))
        self.groupBox_3.setTitle(_translate("MainWindow", "Livraison", None))
        self.btn_effectuer_livraison.setText(_translate("MainWindow", "Effectuer Livraison", None))
+        self.lieuLabel.setText(_translate("MainWindow", "Lieu", None))
+        self.btn_modif_livraison.setText(_translate("MainWindow", "Modifer Livraison ", None))
        self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab_3), _translate("MainWindow", "Services", None))
-        self.label_2.setText(_translate("MainWindow", "Frequentation par jour", None))
-        self.label_3.setText(_translate("MainWindow", "Frequentation par mois", None))
-        self.label_4.setText(_translate("MainWindow", "Duree moyenne de stationnement ", None))
+        self.nombreAbonnLabel.setText(_translate("MainWindow", "Nombre Abonné :", None))
+        self.labelNbAbo.setText(_translate("MainWindow", "TextLabel", None))
+        self.label_2.setText(_translate("MainWindow", "Nombre Super Abonné : ", None))
+        self.labelNbSuperAbo.setText(_translate("MainWindow", "TextLabel", None))
+        self.label_4.setText(_translate("MainWindow", "Durée Moyenne Stationnement :", None))
+        self.labelMoySta.setText(_translate("MainWindow", "TextLabel", None))
        self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab_4), _translate("MainWindow", "Stats", None))
        self.menuFichier.setTitle(_translate("MainWindow", "Fichier", None))
        self.menuA_propos.setTitle(_translate("MainWindow", "A propos", None))
--- a/ui/main.ui
+++ b/ui/main.ui
@ -17,39 +17,26 @@
   <widget class="QTabWidget" name="tabWidget">
    <property name="geometry">
     <rect>
-      <x>20</x>
+      <x>10</x>
      <y>40</y>
      <width>561</width>
      <height>501</height>
     </rect>
    </property>
    <property name="currentIndex">
-     <number>1</number>
+     <number>3</number>
    </property>
    <widget class="QWidget" name="tab">
     <attribute name="title">
      <string>Activite</string>
     </attribute>
-     <widget class="QLabel" name="label">
-      <property name="geometry">
-       <rect>
-        <x>40</x>
-        <y>10</y>
-        <width>61</width>
-        <height>15</height>
-       </rect>
-      </property>
-      <property name="text">
-       <string>Activité :</string>
-      </property>
-     </widget>
     <widget class="QListWidget" name="listWidget">
      <property name="geometry">
       <rect>
-        <x>60</x>
-        <y>50</y>
-        <width>431</width>
-        <height>261</height>
+        <x>10</x>
+        <y>10</y>
+        <width>531</width>
+        <height>451</height>
       </rect>
      </property>
     </widget>
@ -109,7 +96,7 @@
        <item row="3" column="0">
         <widget class="QLabel" name="label_17">
          <property name="text">
-           <string>Places Reserve Super Abo : </string>
+           <string>Places Super Abo : </string>
          </property>
         </widget>
        </item>
@ -238,7 +225,7 @@
        <x>30</x>
        <y>290</y>
        <width>511</width>
-        <height>111</height>
+        <height>171</height>
       </rect>
      </property>
      <property name="title">
@ -257,8 +244,8 @@
      <widget class="QPushButton" name="btn_effectuer_livraison">
       <property name="geometry">
        <rect>
-         <x>326</x>
-         <y>70</y>
+         <x>320</x>
+         <y>120</y>
         <width>161</width>
         <height>27</height>
        </rect>
@ -267,50 +254,113 @@
        <string>Effectuer Livraison</string>
       </property>
      </widget>
+      <widget class="QDateTimeEdit" name="dateTimeEdit">
+       <property name="geometry">
+        <rect>
+         <x>290</x>
+         <y>70</y>
+         <width>194</width>
+         <height>23</height>
+        </rect>
+       </property>
+      </widget>
+      <widget class="QWidget" name="formLayoutWidget">
+       <property name="geometry">
+        <rect>
+         <x>20</x>
+         <y>70</y>
+         <width>261</width>
+         <height>31</height>
+        </rect>
+       </property>
+       <layout class="QFormLayout" name="formLayout">
+        <property name="fieldGrowthPolicy">
+         <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
+        </property>
+        <item row="0" column="0">
+         <widget class="QLabel" name="lieuLabel">
+          <property name="text">
+           <string>Lieu</string>
+          </property>
+         </widget>
+        </item>
+        <item row="0" column="1">
+         <widget class="QLineEdit" name="lieuLineEdit"/>
+        </item>
+       </layout>
+      </widget>
+      <widget class="QPushButton" name="btn_modif_livraison">
+       <property name="geometry">
+        <rect>
+         <x>136</x>
+         <y>120</y>
+         <width>141</width>
+         <height>27</height>
+        </rect>
+       </property>
+       <property name="text">
+        <string>Modifer Livraison </string>
+       </property>
+      </widget>
     </widget>
    </widget>
    <widget class="QWidget" name="tab_4">
     <attribute name="title">
      <string>Stats</string>
     </attribute>
-     <widget class="QLabel" name="label_2">
+     <widget class="QWidget" name="formLayoutWidget_2">
      <property name="geometry">
       <rect>
-        <x>40</x>
-        <y>80</y>
-        <width>161</width>
-        <height>16</height>
+        <x>60</x>
+        <y>40</y>
+        <width>461</width>
+        <height>181</height>
       </rect>
      </property>
-      <property name="text">
-       <string>Frequentation par jour</string>
-      </property>
-     </widget>
-     <widget class="QLabel" name="label_3">
-      <property name="geometry">
-       <rect>
-        <x>40</x>
-        <y>110</y>
-        <width>161</width>
-        <height>16</height>
-       </rect>
-      </property>
-      <property name="text">
-       <string>Frequentation par mois</string>
-      </property>
-     </widget>
-     <widget class="QLabel" name="label_4">
-      <property name="geometry">
-       <rect>
-        <x>40</x>
-        <y>140</y>
-        <width>241</width>
-        <height>16</height>
-       </rect>
-      </property>
-      <property name="text">
-       <string>Duree moyenne de stationnement </string>
-      </property>
+      <layout class="QFormLayout" name="formLayout_2">
+       <item row="0" column="0">
+        <widget class="QLabel" name="nombreAbonnLabel">
+         <property name="text">
+          <string>Nombre Abonné :</string>
+         </property>
+        </widget>
+       </item>
+       <item row="0" column="1">
+        <widget class="QLabel" name="labelNbAbo">
+         <property name="text">
+          <string>TextLabel</string>
+         </property>
+        </widget>
+       </item>
+       <item row="2" column="0">
+        <widget class="QLabel" name="label_2">
+         <property name="text">
+          <string>Nombre Super Abonné : </string>
+         </property>
+        </widget>
+       </item>
+       <item row="2" column="1">
+        <widget class="QLabel" name="labelNbSuperAbo">
+         <property name="text">
+          <string>TextLabel</string>
+         </property>
+        </widget>
+       </item>
+       <item row="3" column="0">
+        <widget class="QLabel" name="label_4">
+         <property name="text">
+          <string>Durée Moyenne Stationnement :</string>
+         </property>
+        </widget>
+       </item>
+       <item row="3" column="1">
+        <widget class="QLabel" name="labelMoySta">
+         <property name="text">
+          <string>TextLabel</string>
+         </property>
+        </widget>
+       </item>
+      </layout>
     </widget>
    </widget>
   </widget>