From 4523aa41b1f6670cc2ff076b70b55adfb634d6d8 Mon Sep 17 00:00:00 2001 From: Matthieu Lamalle Date: Tue, 1 Sep 2020 10:42:09 +0200 Subject: [PATCH 1/5] filtre evenets par projet --- src/schedule-2.0/src/Controller/EventController.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/schedule-2.0/src/Controller/EventController.php b/src/schedule-2.0/src/Controller/EventController.php index 10f82f0..5737243 100755 --- a/src/schedule-2.0/src/Controller/EventController.php +++ b/src/schedule-2.0/src/Controller/EventController.php @@ -60,8 +60,14 @@ class EventController extends AbstractController $events=$em->getRepository("App:Event")->findBy(["user"=>$user]); } } - foreach($events as $event) { + $idproject=$event->getTask()->getProject()->getId(); + + // Filtre par project + if($this->get('session')->get('idproject')!="all") { + if($idproject!=$this->get('session')->get('idproject')) + continue; + } $tmp=$this->formatEvent($event); array_push($tbevents,$tmp); } From a524e353db597ec48404feb80c7b4c4032487cbf Mon Sep 17 00:00:00 2001 From: Matthieu Lamalle Date: Tue, 1 Sep 2020 10:42:50 +0200 Subject: [PATCH 2/5] =?UTF-8?q?cumul=20des=20dur=C3=A9es=20d'=C3=A9v=C3=A9?= =?UTF-8?q?nements=20dans=20les=20rapports=20si=20deux=20=C3=A9v=C3=A9neme?= =?UTF-8?q?nts=20sur=20une=20meme=20date?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/schedule-2.0/src/Controller/ReportController.php | 4 ++-- src/schedule-2.0/templates/Report/planning.html.twig | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/schedule-2.0/src/Controller/ReportController.php b/src/schedule-2.0/src/Controller/ReportController.php index 039fb5c..74e59e8 100755 --- a/src/schedule-2.0/src/Controller/ReportController.php +++ b/src/schedule-2.0/src/Controller/ReportController.php @@ -352,7 +352,7 @@ class ReportController extends AbstractController $end=new \Datetime('first day of this month'); $end->add(new \DateInterval('P'.$nbmonth.'M')); $end->sub(new \DateInterval('P1D')); - + foreach($users as $user) { $tbevents = $this->getEventuser($user,$start,$end,false); @@ -955,7 +955,7 @@ class ReportController extends AbstractController ]; } - $tbevents[$idproject][$idday]["duration"]=($event->getAllday()?1:0.5); + $tbevents[$idproject][$idday]["duration"]+=($event->getAllday()?1:0.5); $st->add(new \DateInterval('P1D')); diff --git a/src/schedule-2.0/templates/Report/planning.html.twig b/src/schedule-2.0/templates/Report/planning.html.twig index 9186e25..fa7ee6d 100644 --- a/src/schedule-2.0/templates/Report/planning.html.twig +++ b/src/schedule-2.0/templates/Report/planning.html.twig @@ -99,9 +99,10 @@

{{ project.displayname }}

Estimé = {{ project.estimate }}
+ Commandé = {{ project.proposed }} Validé = {{ project.validate }}
Planifié = {{ project.planified }}
- RESTE = {{ (project.estimate - project.validate - project.planified) }} + RESTE = {{ ( project.proposed - project.validate - project.planified) }}
From 254dec43729f7a1b5ef2682f87abacbf69cf5c78 Mon Sep 17 00:00:00 2001 From: Matthieu Lamalle Date: Tue, 1 Sep 2020 10:43:05 +0200 Subject: [PATCH 3/5] =?UTF-8?q?ajout=20var=20office=20=C3=A0=20la=20config?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tmpl/schedule-env.local | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tmpl/schedule-env.local b/tmpl/schedule-env.local index 7815fe1..49afc0f 100644 --- a/tmpl/schedule-env.local +++ b/tmpl/schedule-env.local @@ -35,4 +35,7 @@ DATABASE_HOST=%%adresse_ip_mysql # CAS = Redefine local CAS_HOST=%%eolesso_adresse CAS_PORT=%%eolesso_port -CAS_PATH=%%eolesso_cas_folder \ No newline at end of file +CAS_PATH=%%eolesso_cas_folder + +OFFICE_HOUR_START=09:00 +OFFICE_HOUR_END=17:30 \ No newline at end of file From 058d5177eb12b504277069578bfd189e6d01dee9 Mon Sep 17 00:00:00 2001 From: Matthieu Lamalle Date: Tue, 1 Sep 2020 11:45:41 +0200 Subject: [PATCH 4/5] remove select multi user --- .../src/Controller/EventController.php | 13 ++---------- .../src/Controller/HomeController.php | 2 -- .../src/Service/sessionListener.php | 2 -- src/schedule-2.0/templates/base.html.twig | 20 +++++-------------- 4 files changed, 7 insertions(+), 30 deletions(-) diff --git a/src/schedule-2.0/src/Controller/EventController.php b/src/schedule-2.0/src/Controller/EventController.php index 5737243..e255281 100755 --- a/src/schedule-2.0/src/Controller/EventController.php +++ b/src/schedule-2.0/src/Controller/EventController.php @@ -48,17 +48,8 @@ class EventController extends AbstractController if($iduser=="all") $events=$em->getRepository("App:Event")->findAll(); else { - $selectedusers = $this->get("session")->get("selectedusers"); - if (isset($selectedusers) && sizeof($selectedusers)>1){ - $users= []; - foreach($selectedusers as $user) { - array_push($users,$em->getRepository("App:User")->find($user)); - } - $events=$em->getRepository("App:Event")->findBy(["user"=>$users]); - }else{ - $user=$em->getRepository("App:User")->find($iduser); - $events=$em->getRepository("App:Event")->findBy(["user"=>$user]); - } + $user=$em->getRepository("App:User")->find($iduser); + $events=$em->getRepository("App:Event")->findBy(["user"=>$user]); } foreach($events as $event) { $idproject=$event->getTask()->getProject()->getId(); diff --git a/src/schedule-2.0/src/Controller/HomeController.php b/src/schedule-2.0/src/Controller/HomeController.php index 69b72af..01cfb4a 100755 --- a/src/schedule-2.0/src/Controller/HomeController.php +++ b/src/schedule-2.0/src/Controller/HomeController.php @@ -36,9 +36,7 @@ class HomeController extends AbstractController public function selectuser(Request $request) { $iduser = $request->request->get('iduser'); - $selectedusers = $request->request->get('selectedusers'); $this->get('session')->set('iduser',$iduser); - $this->get('session')->set('selectedusers',$selectedusers); $output=["return"=>"OK"]; return new Response(json_encode($output)); } diff --git a/src/schedule-2.0/src/Service/sessionListener.php b/src/schedule-2.0/src/Service/sessionListener.php index a872503..e99f79d 100644 --- a/src/schedule-2.0/src/Service/sessionListener.php +++ b/src/schedule-2.0/src/Service/sessionListener.php @@ -122,8 +122,6 @@ class sessionListener { } $session->set('services',$tbservices); - $selectedusers=[]; - $session->set('selectedusers',$selectedusers); } } } diff --git a/src/schedule-2.0/templates/base.html.twig b/src/schedule-2.0/templates/base.html.twig index 10a6199..301d36b 100644 --- a/src/schedule-2.0/templates/base.html.twig +++ b/src/schedule-2.0/templates/base.html.twig @@ -284,20 +284,13 @@
- + + {% for user in app.session.get('users') %} {% set selected="" %} - {% if app.session.get('selectedusers')|length > 1 %} - {% for suser in app.session.get('selectedusers') %} - {%if user.id == suser %} - {% set selected="selected" %} - {% endif %} - {% endfor %} - {% else %} - {%if user.id==app.session.get('iduser') %} - {% set selected="selected" %} - {% endif %} + {%if user.id==app.session.get('iduser') %} + {% set selected="selected" %} {% endif %} {% endfor %} @@ -520,13 +513,10 @@ $('#sideuser').on('select2:select', function (e) { var data = e.params.data; - var selectedusers = $('#sideuser').val(); - console.log(selectedusers) $.ajax({ type: "POST", data: { iduser: data.id, - selectedusers: selectedusers, }, url: "{{ path('app_home_selectuser') }}", success: function (response) { From c0d1759bed12cc0f9bc3ce1f03e356dcfe4d9234 Mon Sep 17 00:00:00 2001 From: afornerot Date: Tue, 1 Sep 2020 11:54:55 +0200 Subject: [PATCH 5/5] distinguer les vacations sur le flag validateholiday (fixes #29) --- src/schedule-2.0/scripts/migration/migration.php | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/schedule-2.0/scripts/migration/migration.php b/src/schedule-2.0/scripts/migration/migration.php index 91a2b94..17ae0d2 100644 --- a/src/schedule-2.0/scripts/migration/migration.php +++ b/src/schedule-2.0/scripts/migration/migration.php @@ -182,14 +182,25 @@ while($row=$queryold->fetch()) { writeligne(""); writeligne("== Récupération Event"); -$q="SELECT * FROM schedule_event"; +$q="SELECT * FROM schedule_event, schedule_task WHERE event_task=task_id"; $queryold=$bddold->prepare($q); $queryold->execute(); while($row=$queryold->fetch()) { + // Event vacation ? + $isvacation=false; + if($row["task_id"]<=-70) $isvacation=true; + if($row["task_id"]==-85 || $row["task_id"]==-70) $isvacation=true; + + // Validation + $validate=$row["event_validate"]; + $validateholiday=false; + if($isvacation) $validateholiday=$row["event_validate"]; + + // Génération de l'event writeligne($row["event_id"]); $q="INSERT IGNORE INTO event (id, description, start, end, allday, duration, validate, validateholiday, task_id, user_id ) VALUES (?,?,?,?,?,?,?,?,?,?)"; $query=$bddnew->prepare($q); - $query->execute([$row["event_id"],$row["event_description"],$row["event_start"],$row["event_end"],$row["event_allday"],$row["event_duration"],$row["event_validate"],$row["event_validate"],$row["event_task"],$row["event_user"] ]); + $query->execute([$row["event_id"],$row["event_description"],$row["event_start"],$row["event_end"],$row["event_allday"],$row["event_duration"],$validate,$validateholiday,$row["event_task"],$row["event_user"] ]); } writeligne("");