Evarisk#10 [Setup] fix: clean code on the view file

evarisk-charles · Aug 14, 2024 · 7390fef · 7390fef
1 parent 9ee0d91
commit 7390fef
Show file tree

Hide file tree

Showing 12 changed files with 1,493 additions and 1,874 deletions.
diff --git a/README.md b/README.md
@@ -19,7 +19,7 @@
 
 - Support & Assistance : [Forum dolibarr.fr](https://dolibarr.fr) / Par mail à [email protected]
 - Demo : [Demo DigiKanban](https://demodoli.digirisk.com) - ID: demo - Password: demo
-- Documentation : [Wiki DigiKanban](https://wiki.dolibarr.org/index.php/Module_DigiKanban)
+- Documentation : [Wiki DigiKanban](https://wiki.dolibarr.org/view/kanban_view.php/Module_DigiKanban)
 - Projet GitHub : [Projet DigiKanban](https://github.com/Evarisk/digikanban/projects?query=is%3Aopen)
 - Saturne Framework : [Télécharger Saturne](https://dolistore.com/fr/modules/1906-Saturne.html)
 - D'autres modules développés par Evarisk disponibles sur [DoliStore.com](https://dolistore.com)

diff --git a/admin/setup.php b/admin/setup.php
@@ -42,6 +42,7 @@
 // Libraries
 require_once __DIR__ . '/../class/digikanban.class.php';
 require_once __DIR__ . '/../lib/digikanban.lib.php';
+require_once __DIR__ . '/../lib/digikanban_functions.lib.php';
 
 // Global variables definitions
 global $conf, $db, $langs, $moduleName, $user;

diff --git a/check.php b/check.php
@@ -19,6 +19,8 @@
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 
+require_once __DIR__ . '/lib/digikanban_functions.lib.php';
+
 dol_include_once('/digikanban/class/digikanban_checklist.class.php');
 dol_include_once('/digikanban/class/digikanban.class.php');
 dol_include_once('/digikanban/class/digikanban_tags.class.php');
@@ -871,13 +873,13 @@
 			$updatetask = false;
 			$option_taskurgent = !empty($task->array_options['options_digikanban_taskurgent']) ? $task->array_options['options_digikanban_taskurgent'] : '';
 			$keytag = !empty($task->array_options['options_digikanban_colomn']) ? $task->array_options['options_digikanban_colomn'] : '';
-			checkIfNeedToBeTransfered($task, $updatetask, $tobetransferedto, $option_taskurgent);
+			check_if_need_to_be_transfered($task, $updatetask, $tobetransferedto, $option_taskurgent);
 
 			$key = $keytag>0 ? $keytag : 1;
 
 
 			// if(!$obj->dateo || !$obj->datee){
-			// 	$html = getTaskelement($obj, $task, $kanban->status_date, 'enattent');
+			// 	$html = get_task_element($obj, $task, $kanban->status_date, 'enattent');
 			// 	$data['enattent'][]=$html;
 			// }
 
@@ -888,7 +890,7 @@
 			// 		$updatetask = 1;
 			// 	}
 
-			// 	$html = getTaskelement($obj, $task, $kanban->status_date, 'urgents');
+			// 	$html = get_task_element($obj, $task, $kanban->status_date, 'urgents');
 			// 	$data['urgents'][] = $html;
 
 			// }
@@ -897,7 +899,7 @@
 			// 		$dd = dol_getdate($db->jdate($obj->dateo));
 			// 		$dt = dol_mktime(0, 0, 0, $dd['mon'], 1, $dd['year']);
 
-			// 		$html = getTaskelement($obj, $task, $kanban->status_date);
+			// 		$html = get_task_element($obj, $task, $kanban->status_date);
 
 			// 		$data['month'.$dt][]=$html;
 			// 	}
@@ -909,7 +911,7 @@
 			// }
 
 			// if($task->array_options['options_digikanban_colomn']>0 || $object->showtaskinfirstcolomn>0){
-				$html = getTaskelement($obj, $task, $kanban->status_date, 'urgents');
+				$html = get_task_element($obj, $task, $kanban->status_date, 'urgents');
 				$data['colomn'.$key][]=$html;
 			// }
 
@@ -1056,7 +1058,7 @@
 
 	// 	$tobetransferedto = 0;
 	// 	$updatetask = false;
-	// 	checkIfNeedToBeTransfered($task, $updatetask, $tobetransferedto, $option_taskurgent = 0);
+	// 	check_if_need_to_be_transfered($task, $updatetask, $tobetransferedto, $option_taskurgent = 0);
 
 	// 	if ($tobetransferedto == 1) {
 	// 		$result['error'] = 1;
@@ -1115,7 +1117,7 @@
 	}
 
 
-    $titletask = kanbanGetTitleOfCurrentTask($task);
+    $titletask = kanban_get_title_of_current_task($task);
 
 	$result['titletask'] = $titletask;
 	// $html = "true";
@@ -1158,7 +1160,7 @@
 		$html .= '</div>';
 		$html .= $checklist->selectCheck($id_tache);
 	}elseif($id_modal){
-		$html .= selectCheckModal($id_modal);
+		$html .= select_check_modal($id_modal);
 	}
 
 	$html .= '<div class="kanban_btn_set">';

diff --git a/columns/card.php b/columns/card.php
@@ -12,6 +12,7 @@
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
 
 dol_include_once('/digikanban/lib/digikanban.lib.php');
+dol_include_once('/digikanban/lib/digikanban_functions.lib.php');
 dol_include_once('/digikanban/class/digikanban.class.php');
 dol_include_once('/digikanban/class/digikanban_columns.class.php');
 
@@ -148,7 +149,7 @@
 llxHeader(array(), $modname,'','','','',$morejs,0,0);
 
 $linkback ="";
-digikanbanPrepareAdminHead('columns', $linkback, 'title_setup');
+digikanban_admin_prepare_head('columns', $linkback, 'title_setup');
 
 $htmlright = "";
 

diff --git a/columns/list.php b/columns/list.php
@@ -14,6 +14,7 @@
 dol_include_once('/digikanban/class/digikanban.class.php');
 dol_include_once('/digikanban/class/digikanban_columns.class.php');
 dol_include_once('/digikanban/lib/digikanban.lib.php');
+dol_include_once('/digikanban/lib/digikanban_functions.lib.php');
 
 if (empty($conf->digikanban->enabled) || !$user->rights->digikanban->lire) accessforbidden();
 
@@ -231,7 +232,7 @@
 llxHeader('', $title, $help_url = '', $target = '', $disablejs = 0, $disablehead = 0, $arrayofjs);
 
 $linkback ="";
-digikanbanPrepareAdminHead('columns', $linkback, 'title_setup');
+digikanban_admin_prepare_head('columns', $linkback, 'title_setup');
 
 
 $sql = "SELECT";

diff --git a/core/modules/modDigiKanban.class.php b/core/modules/modDigiKanban.class.php
@@ -259,7 +259,7 @@ function __construct($db)
             'titre'    => 'digikanban',
             'prefix'   => '<span class="paddingrightonly fa fa-th-list"></span>',
             'leftmenu' => 'digikanban',
-            'url'      => '/digikanban/index.php',
+            'url'      => '/digikanban/view/kanban_view.php',
             'langs'    => 'digikanban@digikanban',
             'position' => 1000 + $r,
             'enabled'  => 1,