From b647197b48d81b27ae833a6e3e2c1821c6c85b30 Mon Sep 17 00:00:00 2001
From: Jimmy Girardet <ijkl@netc.fr>
Date: Sun, 30 Aug 2020 12:59:47 +0200
Subject: [PATCH] fix: version num

---
 pyproject.toml          |  6 +++---
 src/mycartable/main.py  | 17 +++++++++--------
 tests/python/factory.py | 40 ++++++++++++++++++++++++++++++----------
 3 files changed, 42 insertions(+), 21 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index e6aeba2f..8b5567b2 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,7 +1,7 @@
 [tool.briefcase]
 project_name = "MyCartable"
 bundle = "coding.cacahuete"
-version = "0.9.0"
+version = "0.9.2"
 url = "https://github.com/jgirardet/MyCartable"
 license = "GNU General Public License v3 (GPLv3)"
 author = 'Jimmy Girardet'
@@ -9,8 +9,8 @@ author_email = "ijkl@netc.fr"
 
 [tool.briefcase.app.mycartable]
 formal_name = "MyCartable"
-description = "Toute le travail de l'école, à un seul endroit !!"
-icon = "src/data/icons/appicon"
+description = "My first application"
+#icon = "src/mycartable/resources/mycartable"
 sources = ['src/mycartable']
 requires = ['pyside2==5.15.0',
             'pony>=0.7.11,<0.8',
diff --git a/src/mycartable/main.py b/src/mycartable/main.py
index f4d0dac6..50646bc9 100755
--- a/src/mycartable/main.py
+++ b/src/mycartable/main.py
@@ -21,7 +21,7 @@
 
 
 import package.database
-from pony.orm import DBException
+from pony.orm import DBException, db_session
 
 
 def main_init_database(filename=None, prod=False):
@@ -42,10 +42,10 @@ def main_init_database(filename=None, prod=False):
         filename=filename, create_db=create_db
     )
 
-    # if not prod:
-    # from tests.python.factory import populate_database
-    #
-    # populate_database()
+    if not prod:
+        from tests.python.factory import populate_database
+
+        populate_database()
 
     return package.database.db
 
@@ -83,9 +83,10 @@ def create_singleton_instance(prod=False):
     ui_manager = UiManager()
     databaseObject.ui = ui_manager
 
-    # if not prod:
-    #     databaseObject.anneeActive = 2019
-    #     databaseObject.currentMatiere = 2
+    if not prod:
+        databaseObject.anneeActive = 2019
+        with db_session:
+            databaseObject.currentPage = databaseObject.db.Page.select().first().id
 
     return databaseObject, ui_manager
 
diff --git a/tests/python/factory.py b/tests/python/factory.py
index 9a3114c0..2436d87b 100644
--- a/tests/python/factory.py
+++ b/tests/python/factory.py
@@ -7,7 +7,12 @@
 
 #
 from PySide2.QtGui import QColor
-from package.default_matiere import MATIERE_GROUPE, MATIERES
+from package.default_matiere import (
+    MATIERE_GROUPE,
+    MATIERES,
+    MATIERE_GROUPE_BASE,
+    MATIERES_BASE,
+)
 from pony.orm import db_session, flush
 
 #
@@ -388,15 +393,30 @@ def f_style(
 def populate_database(matieres_list=MATIERES, nb_page=100):
     user = db.Utilisateur(nom="Lenom", prenom="Leprenom")
     annee = Annee(id=2019, niveau="cm1", user=user)
-    Annee(id=2018, niveau="ce2", user=user)
-    [db.GroupeMatiere(**x, annee=annee.id) for x in MATIERE_GROUPE]
-    flush()
-    matieres = [db.Matiere(**x) for x in matieres_list]
-    flush()
-    #
-    for m in matieres:
-        for i in range(3):
-            f_activite(matiere=m.id)
+    groupes = []
+    compteur = 0
+    for groupe in MATIERE_GROUPE_BASE:
+        gr = GroupeMatiere(annee=annee, bgColor=groupe["bgColor"], nom=groupe["nom"])
+        for mat in MATIERES_BASE:
+            if mat["groupe"] == groupe["id"]:
+                m = Matiere(groupe=gr, nom=mat["nom"])
+                compteur += 1
+                ac = Activite(matiere=m, nom="mdomak")
+                page = Page(titre="mojkù", activite=ac)
+        groupes.append(gr)
+
+    # for groupe in groupes:
+    #     self.reApplyGroupeDegrade(groupe.id)
+
+    # Annee(id=2018, niveau="ce2", user=user)
+    # [db.GroupeMatiere(**x, annee=annee.id) for x in MATIERE_GROUPE]
+    # flush()
+    # matieres = [db.Matiere(**x) for x in matieres_list]
+    # flush()
+    # #
+    # for m in matieres:
+    #     for i in range(3):
+    #         f_activite(matiere=m.id)
 
 
 #