[RiskAssessmentTask] fix: CSS and display if one task is 100% progress

Evarisk · Sep 27, 2021 · 38c9592 · 38c9592
1 parent 754a0df
commit 38c9592
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 4 deletions.
diff --git a/core/tpl/digiriskdolibarr_task_view.tpl.php b/core/tpl/digiriskdolibarr_task_view.tpl.php
@@ -6,8 +6,8 @@
 			<?php foreach ($related_tasks as $related_task) : ?>
 				<?php if ($related_task->progress < 100) : ?>
 					<div class="table-cell riskassessment-task-container riskassessment-task-container-<?php echo $related_task->id ?>" value="<?php echo $related_task->ref ?>">
-					<input type="hidden" class="labelForDelete" value="<?php echo $langs->trans('DeleteTask') . ' ' . $related_task->ref . ' ?'; ?>">
-					<div class="riskassessment-task-single-content riskassessment-task-single-content-<?php echo $risk->id ?>">
+						<input type="hidden" class="labelForDelete" value="<?php echo $langs->trans('DeleteTask') . ' ' . $related_task->ref . ' ?'; ?>">
+						<div class="riskassessment-task-single-content riskassessment-task-single-content-<?php echo $risk->id ?>">
 						<div class="riskassessment-task-single riskassessment-task-single-<?php echo $related_task->id ?>   wpeo-table table-row">
 							<div class="riskassessment-task-content table-cell">
 								<div class="riskassessment-task-data">
@@ -78,7 +78,29 @@
 						</div>
 						<!-- RISK ASSESSMENT TASK EDIT MODAL END -->
 					</div>
-				</div>
+					</div>
+				<?php elseif (count($related_tasks) == 1) : ?>
+					<div class="riskassessment-task-container riskassessment-no-task">
+						<div class="riskassessment-task-single-content riskassessment-task-single-content-<?php echo $risk->id ?>">
+							<div class="riskassessment-task-single riskassessment-task-single-<?php echo $risk->id ?>">
+								<div class="riskassessment-task-content">
+									<div class="riskassessment-task-data">
+										<span class="name"><?php echo $langs->trans('NoTaskLinked'); ?></span>
+									</div>
+								</div>
+								<!-- BUTTON MODAL RISK ASSESSMENT TASK ADD  -->
+								<?php if ($permissiontoadd) : ?>
+									<div class="riskassessment-task-add wpeo-button button-square-50 button-primary wpeo-tooltip-event modal-open" aria-label="<?php echo $langs->trans('AddRiskAssessmentTask') ?>" value="<?php echo $risk->id;?>">
+										<i class="fas fa-plus button-icon"></i>
+									</div>
+								<?php else : ?>
+									<div class="wpeo-button button-square-50 button-grey wpeo-tooltip-event" aria-label="<?php echo $langs->trans('PermissionDenied') ?>" value="<?php echo $risk->id;?>">
+										<i class="fas fa-plus button-icon"></i>
+									</div>
+								<?php endif; ?>
+							</div>
+						</div>
+					</div>
 				<?php endif; ?>
 			<?php endforeach; ?>
 		</div>

diff --git a/css/digiriskdolibarr.css b/css/digiriskdolibarr.css
@@ -2391,6 +2391,9 @@
   display: flex;
   -ms-flex-wrap: nowrap;
   flex-wrap: nowrap;
+  -webkit-box-align: center;
+  -ms-flex-align: center;
+  align-items: center;
 }
 .riskassessment-tasks .riskassessment-task-container {
   -webkit-box-flex: 1;

diff --git a/css/digiriskdolibarr.min.css b/css/digiriskdolibarr.min.css
diff --git a/css/scss/table/_riskassessment-task.scss b/css/scss/table/_riskassessment-task.scss
@@ -14,6 +14,7 @@
 .riskassessment-tasks {
   display: flex;
   flex-wrap: nowrap;
+  align-items: center;
 
   .riskassessment-task-container {
     flex-grow: 1;