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

8.1.3 #893

Merged
merged 15 commits into from
Oct 5, 2021
Merged

8.1.3 #893

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
30dc603
[RiskAssessmentDocument] fix: tzuser on date
nicolas-eoxia Oct 1, 2021
cb79ef9
[RiskAssessment] fix: advanced method evaluation
Oct 4, 2021
82090d2
[DigiriskDocuments] fix: display mini society logo
Oct 4, 2021
f4650b8
[DigiriskDocuments] fix: display thumbs small for workunitDocument an…
nicolas-eoxia Oct 4, 2021
ea53a7e
[RiskAssessmentTask] fix: red color for 0% progress
Oct 4, 2021
bc61984
[DigiriskDocuments] fix: add message on risk if no risk detected
nicolas-eoxia Oct 4, 2021
7e58216
[RiskAssessmentDocument] fix: hyperlien http -> https
nicolas-eoxia Oct 4, 2021
20a15d5
[RiskList] fix: selected column displayed
Oct 4, 2021
7971be4
[RiskAssessment] fix: add cont on list button
nicolas-eoxia Oct 4, 2021
6e8e377
[DigiriskMenu] add: overflow menu arborescence
Oct 4, 2021
3aa8b8f
Mise à jour des UT et GP à controler
lmag Oct 4, 2021
3113b62
[DigiriskDocuments] fix: remove text zone and add dynamicly width
nicolas-eoxia Oct 4, 2021
83bfa4e
[CSS] fix: riskassessment add modal width increase
nicolas-eoxia Oct 4, 2021
ff19cb4
[CSS] fix: riskassessment edit modal width increase
nicolas-eoxia Oct 4, 2021
dea4708
[Mod] add: conf version db et version digirisk
nicolas-eoxia Oct 5, 2021
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
4 changes: 2 additions & 2 deletions class/digiriskdocuments/riskassessmentdocument.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,9 +105,9 @@ public function RiskAssessmentDocumentFillJSON($object)

// *** JSON FILLING ***
$json['RiskAssessmentDocument']['nomEntreprise'] = $conf->global->MAIN_INFO_SOCIETE_NOM;
$json['RiskAssessmentDocument']['dateAudit'] = dol_print_date(strtotime($conf->global->DIGIRISKDOLIBARR_RISKASSESSMENTDOCUMENT_AUDIT_START_DATE), '%d/%m/%Y') . ' - ' . dol_print_date(strtotime($conf->global->DIGIRISKDOLIBARR_RISKASSESSMENTDOCUMENT_AUDIT_END_DATE), '%d/%m/%Y');
$json['RiskAssessmentDocument']['dateAudit'] = dol_print_date(strtotime($conf->global->DIGIRISKDOLIBARR_RISKASSESSMENTDOCUMENT_AUDIT_START_DATE), '%d/%m/%Y', 'tzuser') . ' - ' . dol_print_date(strtotime($conf->global->DIGIRISKDOLIBARR_RISKASSESSMENTDOCUMENT_AUDIT_END_DATE), '%d/%m/%Y', 'tzuser');
$json['RiskAssessmentDocument']['emetteurDUER'] = $user->lastname . ' ' . $user->firstname;
$json['RiskAssessmentDocument']['dateGeneration'] = dol_print_date(strtotime($this->date_creation), '%d/%m/%Y %H:%M:%S');
$json['RiskAssessmentDocument']['dateGeneration'] = dol_print_date(strtotime($this->date_creation), '%d/%m/%Y %H:%M:%S', 'tzuser');

if ($conf->global->DIGIRISKDOLIBARR_RISKASSESSMENTDOCUMENT_RECIPIENT > 0) {
$user->fetch($conf->global->DIGIRISKDOLIBARR_RISKASSESSMENTDOCUMENT_RECIPIENT);
Expand Down
34 changes: 27 additions & 7 deletions ...igiriskdolibarr/digiriskdocuments/groupmentdocument/doc_groupmentdocument_odt.modules.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,6 +264,7 @@ public function write_file($object, $outputlangs, $srctemplatepath, $hidedetails
$array_object_from_properties = $this->get_substitutionarray_each_var_object($object, $outputlangs);
//$array_object = $this->get_substitutionarray_object($object, $outputlangs);
$array_soc = $this->get_substitutionarray_mysoc($mysoc, $outputlangs);
$array_soc['mycompany_logo'] = preg_replace('/_small/', '_mini', $array_soc['mycompany_logo']);

$tmparray = array_merge($substitutionarray, $array_object_from_properties, $array_soc);
complete_substitutions_array($tmparray, $outputlangs, $object);
Expand Down Expand Up @@ -312,14 +313,14 @@ public function write_file($object, $outputlangs, $srctemplatepath, $hidedetails
$risk = new Risk($this->db);
if ( ! empty( $digiriskelement ) ) {
$risks = $risk->fetchRisksOrderedByCotation($digiriskelement->id);
if ($risks > 0 && !empty($risks)) {
for ($i = 1; $i <= 4; $i++ ) {
$listlines = $odfHandler->setSegment('risq' . $i);
for ($i = 1; $i <= 4; $i++ ) {
$listlines = $odfHandler->setSegment('risq' . $i);
if ($risks > 0 && !empty($risks)) {
foreach ($risks as $line) {
$evaluation = new RiskAssessment($this->db);
$lastEvaluation = $evaluation->fetchFromParent($line->id, 1);

if ( $lastEvaluation > 0 && !empty($lastEvaluation)) {
if ($lastEvaluation > 0 && !empty($lastEvaluation)) {
$lastEvaluation = array_shift($lastEvaluation);
$scale = $lastEvaluation->get_evaluation_scale();

Expand All @@ -344,7 +345,7 @@ public function write_file($object, $outputlangs, $srctemplatepath, $hidedetails
if (empty($val)) {
$listlines->setVars($key, $langs->trans('NoData'), true, 'UTF-8');
} else {
$listlines->setVars($key, html_entity_decode($val,ENT_QUOTES | ENT_HTML5), true, 'UTF-8');
$listlines->setVars($key, html_entity_decode($val, ENT_QUOTES | ENT_HTML5), true, 'UTF-8');
}
}
} catch (OdfException $e) {
Expand All @@ -357,8 +358,27 @@ public function write_file($object, $outputlangs, $srctemplatepath, $hidedetails
}
}
}
$odfHandler->mergeSegment($listlines);
} else {
$tmparray['nomDanger'] = $langs->trans('NoData');
$tmparray['identifiantRisque'] = $langs->trans('NoData');
$tmparray['quotationRisque'] = $langs->trans('NoData');
$tmparray['commentaireRisque'] = $langs->trans('NoRiskThere');
foreach ($tmparray as $key => $val) {
try {
if (empty($val)) {
$listlines->setVars($key, $langs->trans('NoData'), true, 'UTF-8');
} else {
$listlines->setVars($key, html_entity_decode($val, ENT_QUOTES | ENT_HTML5), true, 'UTF-8');
}
} catch (OdfException $e) {
dol_syslog($e->getMessage(), LOG_INFO);
} catch (SegmentException $e) {
dol_syslog($e->getMessage(), LOG_INFO);
}
}
$listlines->merge();
}
$odfHandler->mergeSegment($listlines);
}
}

Expand Down Expand Up @@ -406,8 +426,8 @@ public function write_file($object, $outputlangs, $srctemplatepath, $hidedetails
}
$listlines->merge();
}
$odfHandler->mergeSegment($listlines);
}
$odfHandler->mergeSegment($listlines);
}

$risksign = new RiskSign($this->db);
Expand Down
74 changes: 57 additions & 17 deletions ...iriskdolibarr/digiriskdocuments/listingrisksaction/doc_listingrisksaction_odt.modules.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,18 +311,17 @@ public function write_file($object, $outputlangs, $srctemplatepath, $hidedetails

if ( ! empty( $digiriskelement ) ) {
$risks = $risk->fetchRisksOrderedByCotation($digiriskelement->id, true);
if ($risks > 0 && !empty($risks)) {
for ($i = 1; $i <= 4; $i++ ) {
$listlines = $odfHandler->setSegment('risk' . $i);

for ($i = 1; $i <= 4; $i++ ) {
$listlines = $odfHandler->setSegment('risk' . $i);
if ($risks > 0 && !empty($risks)) {
foreach ($risks as $line) {

$tmparray['actionPreventionUncompleted'] = "";
$tmparray['actionPreventionCompleted'] = "";

$evaluation = new RiskAssessment($this->db);
$lastEvaluation = $evaluation->fetchFromParent($line->id, 1);
if ( !empty ($lastEvaluation) && $lastEvaluation > 0 ) {
if (!empty ($lastEvaluation) && $lastEvaluation > 0) {
$lastEvaluation = array_shift($lastEvaluation);
$scale = $lastEvaluation->get_evaluation_scale();

Expand All @@ -342,7 +341,7 @@ public function write_file($object, $outputlangs, $srctemplatepath, $hidedetails
if ($related_task->progress == 100) {
$tmparray['actionPreventionCompleted'] .= dol_print_date($related_task->date_c, 'dayhoursec', 'tzuser') . ': ' . $related_task->label . "\n";
} else {
$tmparray['actionPreventionUncompleted'] .= dol_print_date($related_task->date_c, 'dayhoursec', 'tzuser') . ': ' . $related_task->label . ' ' . ($related_task->progress ? $related_task->progress : 0) . '%' . "\n";
$tmparray['actionPreventionUncompleted'] .= dol_print_date($related_task->date_c, 'dayhoursec', 'tzuser') . ': ' . $related_task->label . ' ' . ($related_task->progress ? $related_task->progress : 0) . '%' . "\n";
}
}
} else {
Expand All @@ -364,7 +363,7 @@ public function write_file($object, $outputlangs, $srctemplatepath, $hidedetails
if (empty($val)) {
$listlines->setVars($key, $langs->trans('NoData'), true, 'UTF-8');
} else {
$listlines->setVars($key, html_entity_decode($val,ENT_QUOTES | ENT_HTML5), true, 'UTF-8');
$listlines->setVars($key, html_entity_decode($val, ENT_QUOTES | ENT_HTML5), true, 'UTF-8');
}
}
} catch (OdfException $e) {
Expand All @@ -377,23 +376,43 @@ public function write_file($object, $outputlangs, $srctemplatepath, $hidedetails
}
}
}
$odfHandler->mergeSegment($listlines);
} else {
$tmparray['nomDanger'] = $langs->trans('NoData');
$tmparray['identifiantRisque'] = $langs->trans('NoData');
$tmparray['quotationRisque'] = $langs->trans('NoData');
$tmparray['commentaireRisque'] = $langs->trans('NoRiskThere');
$tmparray['actionPreventionUncompleted'] = $langs->trans('NoData');
$tmparray['actionPreventionCompleted'] = $langs->trans('NoData');
foreach ($tmparray as $key => $val) {
try {
if (empty($val)) {
$listlines->setVars($key, $langs->trans('NoData'), true, 'UTF-8');
} else {
$listlines->setVars($key, html_entity_decode($val, ENT_QUOTES | ENT_HTML5), true, 'UTF-8');
}
} catch (OdfException $e) {
dol_syslog($e->getMessage(), LOG_INFO);
} catch (SegmentException $e) {
dol_syslog($e->getMessage(), LOG_INFO);
}
}
$listlines->merge();
}
$odfHandler->mergeSegment($listlines);
}
} else {
$risks = $risk->fetchRisksOrderedByCotation(0, true);
if ($risks > 0 && !empty($risks)) {
for ($i = 1; $i <= 4; $i++ ) {
$listlines = $odfHandler->setSegment('risk' . $i);

for ($i = 1; $i <= 4; $i++ ) {
$listlines = $odfHandler->setSegment('risk' . $i);
if ($risks > 0 && !empty($risks)) {
foreach ($risks as $line) {

$tmparray['actionPreventionUncompleted'] = "";
$tmparray['actionPreventionCompleted'] = "";

$evaluation = new RiskAssessment($this->db);
$lastEvaluation = $evaluation->fetchFromParent($line->id, 1);
if ( !empty ($lastEvaluation) && $lastEvaluation > 0 ) {
if (!empty ($lastEvaluation) && $lastEvaluation > 0) {
$lastEvaluation = array_shift($lastEvaluation);
$scale = $lastEvaluation->get_evaluation_scale();

Expand All @@ -411,9 +430,9 @@ public function write_file($object, $outputlangs, $srctemplatepath, $hidedetails
if (!empty($related_tasks)) {
foreach ($related_tasks as $related_task) {
if ($related_task->progress == 100) {
$tmparray['actionPreventionCompleted'] .= dol_print_date($related_task->date_c, 'dayhoursec', 'tzuser') . ': ' ."\n";
$tmparray['actionPreventionCompleted'] .= dol_print_date($related_task->date_c, 'dayhoursec', 'tzuser') . ': ' . "\n";
} else {
$tmparray['actionPreventionUncompleted'] .= dol_print_date($related_task->date_c, 'dayhoursec', 'tzuser') . ': ' . $related_task->label . ' ' . ($related_task->progress ? $related_task->progress : 0) . '%'. "\n";
$tmparray['actionPreventionUncompleted'] .= dol_print_date($related_task->date_c, 'dayhoursec', 'tzuser') . ': ' . $related_task->label . ' ' . ($related_task->progress ? $related_task->progress : 0) . '%' . "\n";
}
}
} else {
Expand All @@ -436,7 +455,7 @@ public function write_file($object, $outputlangs, $srctemplatepath, $hidedetails
if (empty($val)) {
$listlines->setVars($key, $langs->trans('NoData'), true, 'UTF-8');
} else {
$listlines->setVars($key, html_entity_decode($val,ENT_QUOTES | ENT_HTML5), true, 'UTF-8');
$listlines->setVars($key, html_entity_decode($val, ENT_QUOTES | ENT_HTML5), true, 'UTF-8');
}
}
} catch (OdfException $e) {
Expand All @@ -449,8 +468,29 @@ public function write_file($object, $outputlangs, $srctemplatepath, $hidedetails
}
}
}
$odfHandler->mergeSegment($listlines);
} else {
$tmparray['nomDanger'] = $langs->trans('NoData');
$tmparray['identifiantRisque'] = $langs->trans('NoData');
$tmparray['quotationRisque'] = $langs->trans('NoData');
$tmparray['commentaireRisque'] = $langs->trans('NoRiskThere');
$tmparray['actionPreventionUncompleted'] = $langs->trans('NoData');
$tmparray['actionPreventionCompleted'] = $langs->trans('NoData');
foreach ($tmparray as $key => $val) {
try {
if (empty($val)) {
$listlines->setVars($key, $langs->trans('NoData'), true, 'UTF-8');
} else {
$listlines->setVars($key, html_entity_decode($val, ENT_QUOTES | ENT_HTML5), true, 'UTF-8');
}
} catch (OdfException $e) {
dol_syslog($e->getMessage(), LOG_INFO);
} catch (SegmentException $e) {
dol_syslog($e->getMessage(), LOG_INFO);
}
}
$listlines->merge();
}
$odfHandler->mergeSegment($listlines);
}
}
}
Expand Down
67 changes: 52 additions & 15 deletions ...igiriskdolibarr/digiriskdocuments/listingrisksphoto/doc_listingrisksphoto_odt.modules.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,14 +311,13 @@ public function write_file($object, $outputlangs, $srctemplatepath, $hidedetails
$risk = new Risk($this->db);
if ( ! empty( $digiriskelement ) ) {
$risks = $risk->fetchRisksOrderedByCotation($digiriskelement->id, true);
if ($risks > 0 && !empty($risks)) {
for ($i = 1; $i <= 4; $i++ ) {
$listlines = $odfHandler->setSegment('risk' . $i);

foreach ($risks as $line) {
for ($i = 1; $i <= 4; $i++ ) {
$listlines = $odfHandler->setSegment('risk' . $i);
if ($risks > 0 && !empty($risks)) {
foreach ($risks as $line) {
$evaluation = new RiskAssessment($this->db);
$lastEvaluation = $evaluation->fetchFromParent($line->id, 1);
if ( !empty ($lastEvaluation) && $lastEvaluation > 0) {
if (!empty ($lastEvaluation) && $lastEvaluation > 0) {
$lastEvaluation = array_shift($lastEvaluation);
$scale = $lastEvaluation->get_evaluation_scale();

Expand Down Expand Up @@ -357,7 +356,7 @@ public function write_file($object, $outputlangs, $srctemplatepath, $hidedetails
if (empty($val)) {
$listlines->setVars($key, $langs->trans('NoData'), true, 'UTF-8');
} else {
$listlines->setVars($key, html_entity_decode($val,ENT_QUOTES | ENT_HTML5), true, 'UTF-8');
$listlines->setVars($key, html_entity_decode($val, ENT_QUOTES | ENT_HTML5), true, 'UTF-8');
}
}
} catch (OdfException $e) {
Expand All @@ -371,19 +370,38 @@ public function write_file($object, $outputlangs, $srctemplatepath, $hidedetails
}
}
}
$odfHandler->mergeSegment($listlines);
} else {
$tmparray['nomDanger'] = $langs->trans('NoData');
$tmparray['identifiantRisque'] = $langs->trans('NoData');
$tmparray['quotationRisque'] = $langs->trans('NoData');
$tmparray['commentaireRisque'] = $langs->trans('NoRiskThere');
$tmparray['photoAssociee'] = $langs->transnoentities('NoFileLinked');
foreach ($tmparray as $key => $val) {
try {
if (empty($val)) {
$listlines->setVars($key, $langs->trans('NoData'), true, 'UTF-8');
} else {
$listlines->setVars($key, html_entity_decode($val, ENT_QUOTES | ENT_HTML5), true, 'UTF-8');
}
} catch (OdfException $e) {
dol_syslog($e->getMessage(), LOG_INFO);
} catch (SegmentException $e) {
dol_syslog($e->getMessage(), LOG_INFO);
}
}
$listlines->merge();
}
$odfHandler->mergeSegment($listlines);
}
} else {
$risks = $risk->fetchRisksOrderedByCotation(0, true);
if ($risks !== -1) {
for ($i = 1; $i <= 4; $i++ ) {
$listlines = $odfHandler->setSegment('risk' . $i);

for ($i = 1; $i <= 4; $i++ ) {
$listlines = $odfHandler->setSegment('risk' . $i);
if ($risks !== -1) {
foreach ($risks as $line) {
$evaluation = new RiskAssessment($this->db);
$lastEvaluation = $evaluation->fetchFromParent($line->id, 1);
if ( !empty ($lastEvaluation) && $lastEvaluation > 0) {
if (!empty ($lastEvaluation) && $lastEvaluation > 0) {
$lastEvaluation = array_shift($lastEvaluation);
$scale = $lastEvaluation->get_evaluation_scale();

Expand Down Expand Up @@ -423,7 +441,7 @@ public function write_file($object, $outputlangs, $srctemplatepath, $hidedetails
if (empty($val)) {
$listlines->setVars($key, $langs->trans('NoData'), true, 'UTF-8');
} else {
$listlines->setVars($key, html_entity_decode($val,ENT_QUOTES | ENT_HTML5), true, 'UTF-8');
$listlines->setVars($key, html_entity_decode($val, ENT_QUOTES | ENT_HTML5), true, 'UTF-8');
}
}
} catch (OdfException $e) {
Expand All @@ -436,8 +454,27 @@ public function write_file($object, $outputlangs, $srctemplatepath, $hidedetails
}
}
}
$odfHandler->mergeSegment($listlines);
} else {
$tmparray['nomDanger'] = $langs->trans('NoData');
$tmparray['identifiantRisque'] = $langs->trans('NoData');
$tmparray['quotationRisque'] = $langs->trans('NoData');
$tmparray['commentaireRisque'] = $langs->trans('NoRiskThere');
$tmparray['photoAssociee'] = $langs->transnoentities('NoFileLinked');
foreach ($tmparray as $key => $val) {
try {
if (empty($val)) {
$listlines->setVars($key, $langs->trans('NoData'), true, 'UTF-8');
} else {
$listlines->setVars($key, html_entity_decode($val, ENT_QUOTES | ENT_HTML5), true, 'UTF-8');
}
} catch (OdfException $e) {
dol_syslog($e->getMessage(), LOG_INFO);
} catch (SegmentException $e) {
dol_syslog($e->getMessage(), LOG_INFO);
}
}
}
$odfHandler->mergeSegment($listlines);
}
}
}
Expand Down
Loading