Skip to content
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

#1839 [Control] add: button to add control on public control history #1886

Merged
merged 3 commits into from
Oct 8, 2024
Merged

#1839 [Control] add: button to add control on public control history #1886

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6c03cad
#1839 [Control] add: button to add control on public control history
theodaviddd Sep 10, 2024
3b196d4
#1839 [Control] fix: trad dolicar and fix button norme
nicolas-eoxia Oct 8, 2024
68183ea
#1839 [Trad] fix: clean and use generic trad
nicolas-eoxia Oct 8, 2024
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
5 changes: 5 additions & 0 deletions class/actions_digiquali.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -406,6 +406,11 @@ public function saturneAdminObjectConst(array $parameters): int
'name' => 'ShowLastControlFirstOnPublicHistory',
'description' => 'ShowLastControlFirstOnPublicHistoryDescription',
'code' => 'DIGIQUALI_SHOW_LAST_CONTROL_FIRST_ON_PUBLIC_HISTORY',
],
'ShowAddControlButtonOnPublicInterface' => [
'name' => 'ShowAddControlButtonOnPublicInterface',
'description' => 'ShowAddControlButtonOnPublicInterfaceDescription',
'code' => 'DIGIQUALI_SHOW_ADD_CONTROL_BUTTON_ON_PUBLIC_INTERFACE',
]
];
$this->results = $constArray;
Expand Down
10 changes: 7 additions & 3 deletions langs/fr_FR/digiquali.lang
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,11 @@ SheetMainCategory = Choix de la catégorie principale du modèle de
SheetMainCategoryDescription = Cette option permet de choisir quelle catégorie sera utilisée lors du choix de catégorie pendant la création d'un contrôle

# Control - Contrôle
DisplayMediasSample = Afficher les médias d'exemple des questions
DisplayControlMediasSampleDescription = Afficher les médias d'exemple des questions dans le contrôle
ExtrafieldsControlManagement = Gestion des attributs supplémentaires des contrôles
DisplayMediasSample = Afficher les médias d'exemple des questions
DisplayControlMediasSampleDescription = Afficher les médias d'exemple des questions dans le contrôle
ExtrafieldsControlManagement = Gestion des attributs supplémentaires des contrôles
ShowAddControlButtonOnPublicInterface = Afficher le bouton d'ajout de contrôle sur l'interface publique de contrôle
ShowAddControlButtonOnPublicInterfaceDescription = Permet d'afficher le bouton d'ajout de contrôle sur l'interface publique de contrôle

# Survey - Questionnaire
DisplaySurveyMediasSampleDescription = Afficher les médias d'exemple des questions dans le questionnaire
Expand Down Expand Up @@ -350,6 +352,8 @@ LastStatusDate = Dernières dates de statut
ValidationDate = Date de validation
ReOpenDate = Date de réouverture



#
# ControlDet
#
Expand Down
15 changes: 12 additions & 3 deletions public/control/public_control_history.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,15 @@
require_once __DIR__ . '/../../../digiquali/lib/digiquali_sheet.lib.php';

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


// Load translation files required by the page.
saturne_load_langs(['bills', 'contracts', 'orders', 'products', 'projects', 'companies', (isModEnabled('dolicar') ? 'dolicar@dolicar' : '')]);
$langsDomains = ['bills', 'contracts', 'orders', 'products', 'projects', 'companies'];
if (isModEnabled('dolicar')) {
$langsDomains[] = 'dolicar@dolicar';
}
saturne_load_langs($langsDomains);

// Get parameters.
$trackId = GETPOST('track_id', 'alpha');
Expand Down Expand Up @@ -134,10 +139,14 @@
print $langs->trans('LastControl');
print '</div>';
print '&nbsp';
print '<div class="wpeo-button switch-public-control-view '. ($showLastControlFirst ? 'button-grey' : '') .'">';
print '<div class="wpeo-button marginleftonly switch-public-control-view '. ($showLastControlFirst ? 'button-grey' : '') .'">';
print '<input hidden class="public-control-view" value="0">';
print $langs->trans('ControlList');
print '</div>';
if (getDolGlobalInt('DIGIQUALI_SHOW_ADD_CONTROL_BUTTON_ON_PUBLIC_INTERFACE') == 1) {
print '<a class="wpeo-button marginleftonly" href="' . dol_buildpath('custom/digiquali/view/control/control_card.php?action=create', 1). '" target="_blank">';
print '<i class="fas fa-plus pictofixedwidth"></i>' . $langs->trans('New' . ucfirst($object->element)) . '</a>';
}
}
if (isModEnabled('dolicar') && $objectType == 'productlot') {
print '<a class="wpeo-button marginleftonly" href="' . dol_buildpath('custom/dolicar/public/agenda/public_vehicle_logbook.php?id=' . $objectId . '&entity=' . $entity . '&backtopage=' . urlencode($_SERVER['REQUEST_URI']), 1). '">';
Expand Down