diff --git a/donnees/Questions 3 et 4.ipynb b/donnees/Questions 3 et 4.ipynb
index 9c441fdcff4977d295936f5968a82ca0c9b4c52d..6088d185e1f702f44d95f8dfce00ca836c25ad5a 100644
--- a/donnees/Questions 3 et 4.ipynb
+++ b/donnees/Questions 3 et 4.ipynb
@@ -27,7 +27,7 @@
},
{
"cell_type": "code",
- "execution_count": 3,
+ "execution_count": null,
"metadata": {},
"outputs": [
{
@@ -3486,15 +3486,19 @@
" liste_jours_travail.insert(0, jour)\n",
" print(liste_jours_travail)\n",
" if liste_jours_travail!=[[], [], [], [], [], []]:\n",
- " NB_PIECES=0\n",
+ " NB_heures=0\n",
+ " retard=0\n",
" for k in liste_jours_travail:\n",
" if k!=[]:\n",
- " NB_PIECES=NB_PIECES+k[0][6]\n",
+ " NB_heures=NB_heures+k[0][7]\n",
+ " if k[0][9]==True or k[0][9]==1:\n",
+ " retard=+1\n",
" #print(datetime.datetime.strptime(date, \"%Y-%m-%d\") - datetime.timedelta(days=7),NUMERO_EMPLOYE,NB_PIECES,0,salaire_horaire*NB_PIECES,noel,anciennete,salaire_horaire*NB_PIECES+noel+anciennete)\n",
" cursor.execute(\"SELECT DATE_LUNDI,SALAIRE_SEMAINE.NUMERO_EMPLOYE from SALAIRE_SEMAINE where DATE_LUNDI=? and NUMERO_EMPLOYE=?\", (datetime.datetime.strptime(date, \"%Y-%m-%d\") - datetime.timedelta(days=7),NUMERO_EMPLOYE))\n",
" semaine_verif=cursor.fetchall()\n",
" if semaine_verif==[]:\n",
- " cursor.execute(\"INSERT INTO SALAIRE_SEMAINE (DATE_LUNDI,NUMERO_EMPLOYE,NB_HEURES, NB_PRODUCTION,SALAIRE_AVANT,NOEL,ANCIENNETE,SALAIRE_APRES) VALUES (?,?,?,?,?,?,?,?)\", ((datetime.datetime.strptime(date, \"%Y-%m-%d\") - datetime.timedelta(days=7)),NUMERO_EMPLOYE,NB_PIECES,0,salaire_horaire*NB_PIECES,noel,anciennete,salaire_horaire*NB_PIECES+noel+anciennete))\n",
+ " cursor.execute(\"INSERT INTO SALAIRE_SEMAINE (DATE_LUNDI,NUMERO_EMPLOYE,NB_HEURES, NB_PRODUCTION,RETARD,SALAIRE_AVANT,NOEL,ANCIENNETE,SALAIRE_APRES) VALUES (?,?,?,?,?,?,?,?)\",\n",
+ " ((datetime.datetime.strptime(date, \"%Y-%m-%d\") - datetime.timedelta(days=7)),NUMERO_EMPLOYE,NB_heures,0,retard,salaire_horaire*NB_heures-retard*5,noel,anciennete,salaire_horaire*NB_heures+noel+anciennete-retard*5))\n",
" if semaine ==[] and CS_PRODUCTION is not None:\n",
" cursor.execute(f\"SELECT SALAIRE_PIECE,PIECE_JOUR FROM GRILLE_SALAIRE_PROD WHERE CS_PRODUCTION = {CS_PRODUCTION}\")\n",
" salaire_PROD ,PIECE_JOUR =cursor.fetchone()\n",
@@ -3516,14 +3520,18 @@
" print(liste_jours_travail)\n",
" if liste_jours_travail!=[[], [], [], [], [], []]:\n",
" NB_PIECES=0\n",
+ " retard=0\n",
" for k in liste_jours_travail:\n",
" if k!=[]:\n",
" NB_PIECES=NB_PIECES+k[0][4]\n",
+ " if k[0][8]==True or k[0][8]==1:\n",
+ " retard=+1\n",
" #print(datetime.datetime.strptime(date, \"%Y-%m-%d\") - datetime.timedelta(days=7),NUMERO_EMPLOYE,NB_PIECES,0,salaire_horaire*NB_PIECES,noel,anciennete,salaire_horaire*NB_PIECES+noel+anciennete)\n",
" cursor.execute(\"SELECT DATE_LUNDI,SALAIRE_SEMAINE.NUMERO_EMPLOYE from SALAIRE_SEMAINE where DATE_LUNDI=? and NUMERO_EMPLOYE=?\", (datetime.datetime.strptime(date, \"%Y-%m-%d\") - datetime.timedelta(days=7),NUMERO_EMPLOYE))\n",
" semaine_verif=cursor.fetchall()\n",
" if semaine_verif==[]:\n",
- " cursor.execute(\"INSERT INTO SALAIRE_SEMAINE (DATE_LUNDI,NUMERO_EMPLOYE,NB_HEURES, NB_PRODUCTION,SALAIRE_AVANT,NOEL,ANCIENNETE,SALAIRE_APRES) VALUES (?,?,?,?,?,?,?,?)\", ((datetime.datetime.strptime(date, \"%Y-%m-%d\") - datetime.timedelta(days=7)),NUMERO_EMPLOYE,0,0,salaire_PROD*NB_PIECES,noel,anciennete,salaire_PROD*NB_PIECES+noel+anciennete))\n",
+ " cursor.execute(\"INSERT INTO SALAIRE_SEMAINE (DATE_LUNDI,NUMERO_EMPLOYE,NB_HEURES, NB_PRODUCTION,RETARD,SALAIRE_AVANT,NOEL,ANCIENNETE,SALAIRE_APRES) VALUES (?,?,?,?,?,?,?,?)\", \n",
+ " ((datetime.datetime.strptime(date, \"%Y-%m-%d\") - datetime.timedelta(days=7)),NUMERO_EMPLOYE,0,NB_PIECES,retard,salaire_PROD*NB_PIECES-retard*5,noel,anciennete,salaire_PROD*NB_PIECES+noel+anciennete-retard*5))\n",
"\n",
"conn.commit()\n",
"conn.close()"
diff --git a/donnees/company.db b/donnees/company.db
index f7a71dd309b2eca8dd41523d61477ce773688c75..cc6f637c02545312e3aa73463fe68d20d74a13f1 100644
Binary files a/donnees/company.db and b/donnees/company.db differ
diff --git a/donnees/generation_donnees.ipynb b/donnees/generation_donnees.ipynb
index e5e71a7bf45831095986a9c8c33bdf91e101e7ac..252dba5a6ee509c34981d716cb10c29dbd26afc8 100644
--- a/donnees/generation_donnees.ipynb
+++ b/donnees/generation_donnees.ipynb
@@ -59,13 +59,13 @@
" if week_day == 5:\n",
" last_log_num_jour += 1\n",
" cursor.execute(\"\"\"\n",
- " INSERT INTO LOG_JOURNEE_JOUR (NUM_LOG_JOUR_JOUR, DATE,WEEK_DAY, NUMERO_EMPLOYE,HEURE_ARRIVEE, HEURE_FIN, NB_HEURES,NB_HEURES_SUP, RETARD)\n",
- " VALUES (?, ?, ?,?, ?, ?, ?,?,?)\"\"\",(last_log_num_jour, datei.strftime('%Y-%m-%d'),week_day, NUMERO_EMPLOYE,str(debut_samedi)+':00',str(debut_samedi+3)+':00',3,0, False ) )\n",
+ " INSERT INTO LOG_JOURNEE_JOUR (NUM_LOG_JOUR_JOUR, DATE,WEEK_DAY, NUMERO_EMPLOYE,HEURE_ARRIVEE,HEURE_ARRIVEE_PREVUE, HEURE_FIN, NB_HEURES,NB_HEURES_SUP, RETARD)\n",
+ " VALUES (?, ?, ?,?, ?, ?, ?,?,?,?)\"\"\",(last_log_num_jour, datei.strftime('%Y-%m-%d'),week_day, NUMERO_EMPLOYE,str(debut_samedi)+':00',str(debut_samedi)+':00',str(debut_samedi+3)+':00',3,0, False ) )\n",
" else:\n",
" last_log_num_jour += 1\n",
" cursor.execute(\"\"\"\n",
- " INSERT INTO LOG_JOURNEE_JOUR (NUM_LOG_JOUR_JOUR, DATE,WEEK_DAY, NUMERO_EMPLOYE,HEURE_ARRIVEE, HEURE_FIN, NB_HEURES,NB_HEURES_SUP, RETARD)\n",
- " VALUES (?, ?, ?,?, ?, ?, ?,?,?)\"\"\",(last_log_num_jour, datei.strftime('%Y-%m-%d'),week_day, NUMERO_EMPLOYE,str(8)+':00',str(debut_samedi+9)+':00',9,0, False ) )\n",
+ " INSERT INTO LOG_JOURNEE_JOUR (NUM_LOG_JOUR_JOUR, DATE,WEEK_DAY, NUMERO_EMPLOYE,HEURE_ARRIVEE,HEURE_ARRIVEE_PREVUE, HEURE_FIN, NB_HEURES,NB_HEURES_SUP, RETARD)\n",
+ " VALUES (?, ?, ?,?, ?, ?, ?,?,?,?)\"\"\",(last_log_num_jour, datei.strftime('%Y-%m-%d'),week_day, NUMERO_EMPLOYE,str(8)+':00',str(8)+':00',str(8+9)+':00',9,0, False ) )\n",
" if CS_PRODUCTION is not None:\n",
" cursor.execute(f\"SELECT PIECE_JOUR , DEBUT_SAMEDI FROM GRILLE_SALAIRE_PROD WHERE CS_PRODUCTION = {CS_PRODUCTION}\")\n",
" piece_jour,debut_samedi = cursor.fetchone()\n",
@@ -78,15 +78,15 @@
" if week_day == 5:\n",
" last_log_num_prod += 1\n",
" cursor.execute(\"\"\"\n",
- " INSERT INTO LOG_JOURNEE_PROD (NUM_LOG_JOUR_PROD, DATE,WEEK_DAY, NUMERO_EMPLOYE,NB_PIECES,NB_PIECES_SUP,HEURE_ARRIVEE,RETARD)\n",
- " VALUES (?, ?, ?,?, ?, ?, ?,?)\n",
- " \"\"\", (last_log_num_prod, datei.strftime('%Y-%m-%d'),week_day, NUMERO_EMPLOYE,piece_jour,0,str(debut_samedi)+':00',False ))\n",
+ " INSERT INTO LOG_JOURNEE_PROD (NUM_LOG_JOUR_PROD, DATE,WEEK_DAY, NUMERO_EMPLOYE,NB_PIECES,NB_PIECES_SUP,HEURE_ARRIVEE,HEURE_ARRIVEE_PREVUE,RETARD)\n",
+ " VALUES (?, ?, ?,?, ?, ?, ?,?,?)\n",
+ " \"\"\", (last_log_num_prod, datei.strftime('%Y-%m-%d'),week_day, NUMERO_EMPLOYE,piece_jour,0,str(debut_samedi)+':00',str(debut_samedi)+':00',False ))\n",
" else: \n",
" last_log_num_prod += 1\n",
" cursor.execute(\"\"\"\n",
- " INSERT INTO LOG_JOURNEE_PROD (NUM_LOG_JOUR_PROD, DATE,WEEK_DAY, NUMERO_EMPLOYE,NB_PIECES,NB_PIECES_SUP,HEURE_ARRIVEE,RETARD)\n",
- " VALUES (?, ?, ?,?, ?, ?, ?,?)\n",
- " \"\"\", (last_log_num_prod, datei.strftime('%Y-%m-%d'),week_day, NUMERO_EMPLOYE,piece_jour,0,'08:00',False ))\n",
+ " INSERT INTO LOG_JOURNEE_PROD (NUM_LOG_JOUR_PROD, DATE,WEEK_DAY, NUMERO_EMPLOYE,NB_PIECES,NB_PIECES_SUP,HEURE_ARRIVEE,HEURE_ARRIVEE_PREVUE,RETARD)\n",
+ " VALUES (?, ?, ?,?, ?, ?, ?,?,?)\n",
+ " \"\"\", (last_log_num_prod, datei.strftime('%Y-%m-%d'),week_day, NUMERO_EMPLOYE,piece_jour,0,'8:00','8:00',False ))\n",
"\n",
"# Commit the changes\n",
"conn.commit()\n",