Skip to content

#621 [Admin] fix: rework workinghours_card #630

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nicolas-eoxia wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

#621 [Admin] fix: rework workinghours_card #630

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion class/workinghours.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ class Workinghours extends CommonObject
/**
* @var string String with name of icon for workinghours. Must be the part after the 'object_' into object_workinghours.png
*/
public $picto = 'workinghours@dolisirh';
public $picto = 'fontawesome_fa-clock_fas_#d35968';

/**
* @var array Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
Expand Down
337 changes: 117 additions & 220 deletions view/workinghours_card.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?php
/* Copyright (C) 2023 EVARISK <dev@evarisk.com>
/* Copyright (C) 2023-2025 EVARISK <technique@evarisk.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand All @@ -16,264 +16,161 @@
*/

/**
* \file view/workinghours_card.php
* \ingroup dolisirh
* \brief Page to view Working Hours
* \file view/workinghours_card.php
* \ingroup dolisirh
* \brief Page to view working hours
*/

// Load Dolibarr environment
$res = 0;
// Try main.inc.php into web root known defined into CONTEXT_DOCUMENT_ROOT (not always defined)
if ( ! $res && ! empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) $res = @include $_SERVER["CONTEXT_DOCUMENT_ROOT"] . "/main.inc.php";
// Try main.inc.php into web root detected using web root calculated from SCRIPT_FILENAME
$tmp = empty($_SERVER['SCRIPT_FILENAME']) ? '' : $_SERVER['SCRIPT_FILENAME']; $tmp2 = realpath(__FILE__); $i = strlen($tmp) - 1; $j = strlen($tmp2) - 1;
while ($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i] == $tmp2[$j]) { $i--; $j--; }
if ( ! $res && $i > 0 && file_exists(substr($tmp, 0, ($i + 1)) . "/main.inc.php")) $res = @include substr($tmp, 0, ($i + 1)) . "/main.inc.php";
if ( ! $res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i + 1))) . "/main.inc.php")) $res = @include dirname(substr($tmp, 0, ($i + 1))) . "/main.inc.php";
// Try main.inc.php using relative path
if ( ! $res && file_exists("../../main.inc.php")) $res = @include "../../main.inc.php";
if ( ! $res && file_exists("../../../main.inc.php")) $res = @include "../../../main.inc.php";
if ( ! $res) die("Include of main fails");

// Libraries
require_once DOL_DOCUMENT_ROOT . '/core/lib/company.lib.php';
// Load DoliSIRH environment
$found = false;
for ($i = 1; $i <= 2; $i++) {
Copy link
Contributor

@evarisk-micka evarisk-micka May 6, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Utiliser une boucle est plus évolutif cependant il faudra penser à le répercuter partout parceque de base on fait plutôt comme ça :

// Load DoliSecu environment
if (file_exists('../dolisecu.main.inc.php')) {
	require_once __DIR__ . '/../dolisecu.main.inc.php';
} elseif (file_exists('../../dolisecu.main.inc.php')) {
	require_once __DIR__ . '/../../dolisecu.main.inc.php';
} else {
	die('Include of dolisecu main fails');
}

$filePath = __DIR__ . str_repeat('/..', $i) . '/dolisirh.main.inc.php';
if (file_exists($filePath)) {
require_once $filePath;
$found = true;
break;
}
}
if (!$found) {
die('Include of dolisirh main fails');
}

// Load Dolibarr libraries
require_once DOL_DOCUMENT_ROOT . '/core/lib/usergroups.lib.php';
require_once DOL_DOCUMENT_ROOT . '/core/lib/images.lib.php';

require_once './../class/workinghours.class.php';
// load DoliSIRH libraries
require_once __DIR__ . '/../class/workinghours.class.php';

// Global variables definitions
global $db, $hookmanager, $langs, $user;

// Load translation files required by the page
$langs->loadLangs(array("dolisirh@dolisirh"));
// Load translation files required by the page.
saturne_load_langs();

// Parameters
$action = (GETPOST('action', 'aZ09') ? GETPOST('action', 'aZ09') : 'view');
$backtopage = GETPOST('backtopage', 'alpha');
// Get parameters
$id = GETPOSTINT('id');
$action = GETPOST('action', 'aZ09');
$backToPage = GETPOST('backtopage', 'alpha');

$socid = GETPOST('socid', 'int') ? GETPOST('socid', 'int') : GETPOST('id', 'int');
if ($usertmp->socid) $socid = $usertmp->socid;
if (empty($socid) && $action == 'view') $action = 'create';
// Initialize technical objects
$object = new Workinghours($db);
$userTmp = new User($db);

$usertmp = new User($db);
// Initialize view objects
$form = new Form($db);

// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
$hookmanager->initHooks(array('userworkinghours', 'globalcard'));
$hookmanager->initHooks(['userworkinghours', 'globalcard']); // Note that conf->hooks_modules contains array

if ($action == 'view' && $usertmp->fetch($socid) <= 0) {
$langs->load("errors");
print($langs->trans('ErrorRecordNotFound'));
exit;
}
// Load object
$userTmp->fetch($id);
$moreWhere = ' AND element_id = ' . $id . ' AND element_type = "' . $user->element . '" AND status = 1';
$object->fetch(0, '', $moreWhere);

// Security check
$permissiontoadd = $usertmp->rights->societe->creer;
// Security check - Protection if external user

/*
* Actions
*/
// Build current user hierarchy
$userTmpHierarchy = [];
if ($userTmp->fk_user > 0) {
$userTmpHierarchy[] = $userTmp->fk_user;

$parameters = array();
$reshook = $hookmanager->executeHooks('doActions', $parameters, $usertmp, $action); // Note that $action and $usertmp may have been modified by some hooks
if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');

if (($action == 'update' && ! GETPOST("cancel", 'alpha')) || ($action == 'updateedit')) {
$object = new Workinghours($db);
$object->element_type = $usertmp->element;
$object->element_id = GETPOST('id');
$object->status = 1;
$object->fk_user_creat = $user->id;
$object->schedule_monday = GETPOST('schedule_monday', 'string');
$object->schedule_tuesday = GETPOST('schedule_tuesday', 'string');
$object->schedule_wednesday = GETPOST('schedule_wednesday', 'string');
$object->schedule_thursday = GETPOST('schedule_thursday', 'string');
$object->schedule_friday = GETPOST('schedule_friday', 'string');
$object->schedule_saturday = GETPOST('schedule_saturday', 'string');
$object->schedule_sunday = GETPOST('schedule_sunday', 'string');

$object->workinghours_monday = GETPOST('workinghours_monday', 'integer');
$object->workinghours_tuesday = GETPOST('workinghours_tuesday', 'integer');
$object->workinghours_wednesday = GETPOST('workinghours_wednesday', 'integer');
$object->workinghours_thursday = GETPOST('workinghours_thursday', 'integer');
$object->workinghours_friday = GETPOST('workinghours_friday', 'integer');
$object->workinghours_saturday = GETPOST('workinghours_saturday', 'integer');
$object->workinghours_sunday = GETPOST('workinghours_sunday', 'integer');
$result = $object->create($usertmp);
if ($result > 0) {
setEventMessages($langs->trans('UserWorkingHoursSaved'), null, 'mesgs');
if (!empty($backtopage)) {
header('Location: ' . $backtopage);
$userTmpBoss = new User($db);
$userTmpBoss->fetch($userTmp->fk_user);
while ($userTmpBoss->fk_user > 0) {
$userTmpHierarchy[] = $userTmpBoss->fk_user;
$userTmpBoss->fetch($userTmpBoss->fk_user);
// We do not want to loop between two users who would be each other bosses
if (in_array($userTmpBoss->id, $userTmpHierarchy)) {
break;
}
} else {
setEventMessages($langs->trans('UserWorkingHoursSave'), null, 'error');
}
}
}

$permissionToManageWorkingHours = $user->hasRight('dolisirh', $object->element, 'myworkinghours')
|| $user->hasRight('dolisirh', $object->element, 'allworkinghours')
|| in_array($user->id, $userTmpHierarchy)
|| $user->admin == 1;

/*
* View
* Actions
*/

$object = new Workinghours($db);

$morewhere = ' AND element_id = ' . GETPOST('id');
$morewhere .= ' AND element_type = ' . "'" . $usertmp->element . "'";
$morewhere .= ' AND status = 1';
$parameters = [];
$resHook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
if ($resHook < 0) {
setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
}

$object->fetch(0, '', $morewhere);
if (empty($resHook)) {
if ($action == 'save_working_hours' && !empty($permissionToManageWorkingHours)) {
$object->element_type = $user->element;
$object->element_id = $id;
$object->status = 1;
$dayOfWeek = ['monday', 'tuesday', 'wednesday', 'thursday', 'friday', 'saturday', 'sunday'];
foreach ($dayOfWeek as $day) {
$object->{'schedule_' . $day} = GETPOST('schedule_' . $day);
$object->{'workinghours_' . $day} = GETPOSTINT('workinghours_' . $day);
}

if ($socid > 0 && empty($usertmp->id)) {
$result = $usertmp->fetch($socid);
if ($result <= 0) dol_print_error('', $usertmp->error);
$result = $object->create($user);
if ($result > 0) {
setEventMessages('UserWorkingHoursSaved', []);
} else {
setEventMessages('Error', [], 'error');
}
header('Location: ' . (!empty($backToPage) ? $backToPage : $_SERVER['PHP_SELF'] . '?id=' . $id));
exit;
}
}

$title = $langs->trans("User");
if ( ! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/', $conf->global->MAIN_HTML_TITLE) && $usertmp->name) $title = $usertmp->name . " - " . $langs->trans('WorkingHours');
$help_url = 'FR:Module_DoliSIRH';

$morecss = array("/dolisirh/css/dolisirh.css");
/*
* View
*/

llxHeader('', $title, $help_url, '', '', '', array(), $morecss);
$title = $langs->trans(ucfirst($object->element));
$helpUrl = 'FR:Module_DoliSIRH';

if ( ! empty($usertmp->id)) $res = $usertmp->fetch_optionals();
saturne_header(0, '', $title, $helpUrl);

// Object card
// ------------------------------------------------------------
$morehtmlref = '<div class="refidno">';
$morehtmlref .= '</div>';
$head = user_prepare_head($usertmp);
print dol_get_fiche_head($head, 'workinghours', $langs->trans("User"), 0, 'company');
$linkback = '<a href="' . DOL_URL_ROOT . '/societe/list.php?restore_lastsearch_values=1">' . $langs->trans("BackToList") . '</a>';
dol_banner_tab($usertmp, 'socid', $linkback, ($usertmp->socid ? 0 : 1), 'rowid', 'nom');
$head = user_prepare_head($userTmp);
print dol_get_fiche_head($head, 'workinghours', $langs->trans('User'), 0, 'user');
$linkBack = '<a href="' . DOL_URL_ROOT . '/user/list.php?restore_lastsearch_values=1">' . $langs->trans('BackToList') . '</a>';
dol_banner_tab($userTmp, 'id', $linkBack, 1, 'rowid', 'nom');

print dol_get_fiche_end();

print load_fiche_titre($langs->trans('WorkingHours'), '', '');
print load_fiche_titre($langs->trans('WorkingHours'), '', $object->picto);

//Show common fields

if ( ! is_object($form)) $form = new Form($db);

print '<form method="POST" action="' . $_SERVER["PHP_SELF"] . '?id=' . GETPOST('id') . '" >';
print '<form method="POST" action="' . $_SERVER['PHP_SELF'] . '?id=' . $id . '" >';
print '<input type="hidden" name="token" value="' . newToken() . '">';
print '<input type="hidden" name="action" value="update">';
print '<input type="hidden" name="id" value="' . GETPOST('id') . '">';
if ($backtopage) {
print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
print '<input type="hidden" name="action" value="save_working_hours">';
if (!empty($backToPage)) {
print '<input type="hidden" name="backtopage" value="' . $backToPage . '">';
}

print '<table class="noborder centpercent editmode">';

print '<tr class="liste_titre"><th class="titlefield wordbreak">' . $langs->trans("Day") . '</th><th style="width: 300px">' . $langs->trans("Schedules") . '</th><th>'. $langs->trans('WorkingHours(min)') .'</th></tr>' . "\n";

print '<tr class="oddeven"><td>';
print $form->textwithpicto($langs->trans("Monday"), '');
print '</td><td>';
print '<input name="schedule_monday" id="schedule_monday" class="minwidth100" value="' . ($object->schedule_monday ?: GETPOST("schedule_monday", 'alpha')) . '"' . (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '' : ' autofocus="autofocus"') . '>';
print $form->textwithpicto('', $langs->trans("OpeningHoursFormatDesc"));
print '</td>';

print '<td>';
print '<input type="number" name="workinghours_monday" id="workinghours_monday" class="minwidth100" value="' . ($object->workinghours_monday ?: GETPOST("workinghours_monday", 'alpha')) . '"' . (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '' : ' autofocus="autofocus"') . '>';
print $form->textwithpicto('', $langs->trans("WorkingHoursFormatDesc"));
print '</td>';
print '</tr>' . "\n";

print '<tr class="oddeven"><td>';
print $form->textwithpicto($langs->trans("Tuesday"), '');
print '</td><td>';
print '<input name="schedule_tuesday" id="schedule_tuesday" class="minwidth100" value="' . ($object->schedule_tuesday ?: GETPOST("schedule_tuesday", 'alpha')) . '"' . (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '' : ' autofocus="autofocus"') . '>';
print $form->textwithpicto('', $langs->trans("OpeningHoursFormatDesc"));
print '</td>';
print '<td>';
print '<input type="number" name="workinghours_tuesday" id="workinghours_tuesday" class="minwidth100" value="' . ($object->workinghours_tuesday ?: GETPOST("workinghours_tuesday", 'alpha')) . '"' . (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '' : ' autofocus="autofocus"') . '>';
print $form->textwithpicto('', $langs->trans("WorkingHoursFormatDesc"));
print '</td>';
print '</tr>' . "\n";

print '<tr class="oddeven"><td>';
print $form->textwithpicto($langs->trans("Wednesday"), '');
print '</td><td>';
print '<input name="schedule_wednesday" id="schedule_wednesday" class="minwidth100" value="' . ($object->schedule_wednesday ?: GETPOST("schedule_wednesday", 'alpha')) . '"' . (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '' : ' autofocus="autofocus"') . '>';
print $form->textwithpicto('', $langs->trans("OpeningHoursFormatDesc"));
print '</td>';
print '<td>';
print '<input type="number" name="workinghours_wednesday" id="workinghours_wednesday" class="minwidth100" value="' . ($object->workinghours_wednesday ?: GETPOST("workinghours_wednesday", 'alpha')) . '"' . (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '' : ' autofocus="autofocus"') . '>';
print $form->textwithpicto('', $langs->trans("WorkingHoursFormatDesc"));
print '</td>';
print '</tr>' . "\n";

print '<tr class="oddeven"><td>';
print $form->textwithpicto($langs->trans("Thursday"), '');
print '</td><td>';
print '<input name="schedule_thursday" id="schedule_thursday" class="minwidth100" value="' . ($object->schedule_thursday ?: GETPOST("schedule_thursday", 'alpha')) . '"' . (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '' : ' autofocus="autofocus"') . '>';
print $form->textwithpicto('', $langs->trans("OpeningHoursFormatDesc"));
print '</td>';
print '<td>';
print '<input type="number" name="workinghours_thursday" id="workinghours_thursday" class="minwidth100" value="' . ($object->workinghours_thursday ?: GETPOST("workinghours_thursday", 'alpha')) . '"' . (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '' : ' autofocus="autofocus"') . '>';
print $form->textwithpicto('', $langs->trans("WorkingHoursFormatDesc"));
print '</td>';
print '</tr>' . "\n";

print '<tr class="oddeven"><td>';
print $form->textwithpicto($langs->trans("Friday"), '');
print '</td><td>';
print '<input name="schedule_friday" id="schedule_friday" class="minwidth100" value="' . ($object->schedule_friday ?: GETPOST("schedule_friday", 'alpha')) . '"' . (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '' : ' autofocus="autofocus"') . '>';
print $form->textwithpicto('', $langs->trans("OpeningHoursFormatDesc"));
print '</td>';
print '<td>';
print '<input type="number" name="workinghours_friday" id="workinghours_friday" class="minwidth100" value="' . ($object->workinghours_friday ?: GETPOST("workinghours_friday", 'alpha')) . '"' . (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '' : ' autofocus="autofocus"') . '>';
print $form->textwithpicto('', $langs->trans("WorkingHoursFormatDesc"));
print '</td>';
print '</tr>' . "\n";

print '<tr class="oddeven"><td>';
print $form->textwithpicto($langs->trans("Saturday"), '');
print '</td><td>';
print '<input name="schedule_saturday" id="schedule_saturday" class="minwidth100" value="' . ($object->schedule_saturday ?: GETPOST("schedule_saturday", 'alpha')) . '"' . (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '' : ' autofocus="autofocus"') . '>';
print $form->textwithpicto('', $langs->trans("OpeningHoursFormatDesc"));
print '</td>';
print '<td>';
print '<input type="number" name="workinghours_saturday" id="workinghours_saturday" class="minwidth100" value="' . ($object->workinghours_saturday ?: GETPOST("workinghours_saturday", 'alpha')) . '"' . (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '' : ' autofocus="autofocus"') . '>';
print $form->textwithpicto('', $langs->trans("WorkingHoursFormatDesc"));
print '</td>';
print '</tr>' . "\n";

print '<tr class="oddeven"><td>';
print $form->textwithpicto($langs->trans("Sunday"), '');
print '</td><td>';
print '<input name="schedule_sunday" id="schedule_sunday" class="minwidth100" value="' . ($object->schedule_sunday ?: GETPOST("schedule_sunday", 'alpha')) . '"' . (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '' : ' autofocus="autofocus"') . '>';
print $form->textwithpicto('', $langs->trans("OpeningHoursFormatDesc"));
print '</td>';
print '<td>';
print '<input type="number" name="workinghours_sunday" id="workinghours_sunday" class="minwidth100" value="' . ($object->workinghours_sunday ?: GETPOST("workinghours_sunday", 'alpha')) . '"' . (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '' : ' autofocus="autofocus"') . '>';
print $form->textwithpicto('', $langs->trans("WorkingHoursFormatDesc"));
print '</td>';
print '</tr>' . "\n";
print '<table class="noborder centpercent">';
print '<tr class="liste_titre">';
print '<th class="maxwidth100">' . $langs->trans('Day') . '</th>';
print '<th class="maxwidth100">' . $langs->trans('Schedules') . '</th>';
print '<th class="maxwidth100">' . $langs->trans('WorkingHours(min)') . '</th>';
print '</tr>';

$dayOfWeek = ['monday', 'tuesday', 'wednesday', 'thursday', 'friday', 'saturday', 'sunday'];
foreach ($dayOfWeek as $day) {
print '<tr class="oddeven"><td class="maxwidth100">';
print $langs->trans(ucfirst($day));
print '</td><td>';
print '<input name="schedule_' . $day . '" class="maxwidth100" value="' . ($object->{'schedule_' . $day} ?: GETPOST('schedule_' . $day, 'alpha')) . '">';
print $form->textwithpicto('', $langs->trans('OpeningHoursFormatDesc'));
print '</td><td>';
print '<input type="number" name="workinghours_' . $day . '" class="maxwidth100" min="0" value="' . ($object->{'workinghours_' . $day} ?: GETPOST('workinghours_' . $day, 'alpha')) . '">';
print $form->textwithpicto('', $langs->trans('WorkingHoursFormatDesc'));
print '</td></tr>';
}

print '</table>';

// Buid current user hierarchy
$usertmphierarchy = [];
if ($usertmp->fk_user > 0) {
$usertmphierarchy = array($usertmp->fk_user);
$usertmpboss = new User($object->db);
$usertmpboss->fetch($usertmp->fk_user);
while ($usertmpboss->fk_user > 0) {
$usertmphierarchy[] = $usertmpboss->fk_user;
$usertmpboss->fetch($usertmpboss->fk_user);
// We do not want to loop between two users who would be each other bosses
if (in_array($usertmpboss->id, $usertmphierarchy)) {
break;
}
}
}

if (($user->rights->dolisirh->workinghours->myworkinghours && $usertmp->id == $user->id) || ($user->rights->dolisirh->workinghours->allworkinghours && in_array($user->id, $usertmphierarchy)) || $user->admin == 1){
print '<br><div class="center">';
print '<input type="submit" class="button" name="save" value="' . $langs->trans("Save") . '">';
print '</div>';
print '<br>';
if (!empty($permissionToManageWorkingHours)) {
print $form->buttonsSaveCancel('Save', '');
}

print '</form>';
Expand Down