Merge pull request Evarisk#385 from nicolas-eoxia/add_rework_timespen…

…t_view Evarisk#73 [TimeSpent] add: rework timespent view with range instead of 3 views
nicolas-eoxia · Jul 13, 2023 · cf506b9 · cf506b9
2 parents 5d557e5 + 52d27d2
commit cf506b9
Show file tree

Hide file tree

Showing 10 changed files with 839 additions and 2,494 deletions.
diff --git a/admin/setup.php b/admin/setup.php
@@ -182,7 +182,7 @@
         $bookmark = new Bookmark($db);
 
         $bookmark->title    = $langs->transnoentities('TimeSpent');
-        $bookmark->url      = DOL_URL_ROOT . '/custom/dolisirh/view/timespent_month.php';
+        $bookmark->url      = DOL_URL_ROOT . '/custom/dolisirh/view/timespent_range.php?view_mode=month';
         $bookmark->target   = 0;
         $bookmark->position = 10;
         $bookmark->create();

diff --git a/core/modules/modDoliSIRH.class.php b/core/modules/modDoliSIRH.class.php
@@ -194,7 +194,7 @@ public function __construct($db)
             $i++ => ['DOLISIRH_SHOW_PATCH_NOTE', 'integer', 1, '', 0, 'current'],
             $i++ => ['DOLISIRH_DB_VERSION', 'chaine', $this->version, '', 0, 'current'],
             $i++ => ['DOLISIRH_VERSION','chaine', $this->version, '', 0, 'current'],
-            
+
             // CONST DOLISIRH DOCUMENTS.
             $i++ => ['DOLISIRH_AUTOMATIC_PDF_GENERATION', 'integer', 0, '', 0, 'current'],
             $i++ => ['DOLISIRH_MANUAL_PDF_GENERATION', 'integer', 0, '', 0, 'current'],
@@ -421,7 +421,7 @@ public function __construct($db)
             'prefix'   => '<i class="far fa-clock pictofixedwidth"></i>',
             'mainmenu' => 'dolisirh',
             'leftmenu' => 'timespent',
-            'url'      => '/dolisirh/view/timespent_month.php',
+            'url'      => '/dolisirh/view/timespent_range.php?view_mode=month',
             'langs'    => 'dolisirh@dolisirh',
             'position' => 1000 + $r,
             'enabled'  => '$conf->dolisirh->enabled && $conf->projet->enabled',
@@ -468,7 +468,7 @@ public function __construct($db)
             'titre'    => '<i class="fas fa-id-card pictofixedwidth" style="padding-right: 4px;"></i>' . $langs->transnoentities('TimeSpending'),
             'mainmenu' => 'project',
             'leftmenu' => 'timespent',
-            'url'      => '/dolisirh/view/timespent_day.php',
+            'url'      => '/dolisirh/view/timespent_range.php?view_mode=month',
             'langs'    => 'dolisirh@dolisirh',
             'position' => 1000 + $r,
             'enabled'  => '$conf->dolisirh->enabled && $conf->projet->enabled',
@@ -499,7 +499,7 @@ public function __construct($db)
             'titre'    => '<i class="fas fa-id-card pictofixedwidth" style="padding-right: 4px;"></i>' . $langs->transnoentities('TimeSpending'),
             'mainmenu' => 'hrm',
             'leftmenu' => 'timespent',
-            'url'      => '/dolisirh/view/timespent_day.php',
+            'url'      => '/dolisirh/view/timespent_range.php?view_mode=month',
             'langs'    => 'dolisirh@dolisirh',
             'position' => 1000 + $r,
             'enabled'  => '$conf->dolisirh->enabled && $conf->salaries->enabled',

diff --git a/js/dolisirh.min.js b/js/dolisirh.min.js
diff --git a/js/modules/task.js b/js/modules/task.js
@@ -145,7 +145,7 @@ window.dolisirh.task.showOnlyFavoriteTasks = function() {
     }
 
     $.ajax({
-        url: document.URL + querySeparator + "action=showOnlyFavoriteTasks&token=" + token,
+        url: document.URL + querySeparator + "action=show_only_favorite_tasks&token=" + token,
         type: "POST",
         processData: false,
         data: JSON.stringify({
@@ -183,7 +183,7 @@ window.dolisirh.task.showOnlyTasksWithTimeSpent = function() {
     }
 
     $.ajax({
-        url: document.URL + querySeparator + "action=showOnlyTasksWithTimeSpent&token=" + token,
+        url: document.URL + querySeparator + "action=show_only_tasks_with_timespent&token=" + token,
         type: "POST",
         processData: false,
         data: JSON.stringify({
@@ -226,7 +226,7 @@ window.dolisirh.task.createTimeSpent = function() {
     document.URL.match(/\?/) ? querySeparator = '&' : 1;
 
     $.ajax({
-        url: document.URL + querySeparator + 'action=addTimeSpent&token=' + token,
+        url: document.URL + querySeparator + 'action=add_timespent&token=' + token,
         data: JSON.stringify({
             taskID: taskID,
             timestamp: timestamp,