Commit aac4e441 authored by Stéphane Bouvry's avatar Stéphane Bouvry
Browse files

Mise en forme de la liste des déclarations

parent 04353f6a
Loading
Loading
Loading
Loading
+3 −0
Changes for module/Oscar/src/Oscar/Service/TimesheetService.php: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -1033,12 +1033,14 @@ class TimesheetService implements ServiceLocatorAwareInterface, EntityManagerAwa
                            'unexpected'        => false,
                            'total'             => 0.0,
                            'total_activities'  => 0.0,
                            'total_activities_details' => [],
                            'total_horslots'    => 0.0,
                            'validation_state'  => 'none',
                            'validations_id'    => []
                        ];
                    }
                    $periodsDetails[$period]['activities_id'][] = $activity->getId();
                    $periodsDetails[$period]['total_activities_details'][$activity->getId()] = 0.0;
                    $periodsDetails[$period]['workpackages_id'] = $workPackagesId;
                }
            }
@@ -1080,6 +1082,7 @@ class TimesheetService implements ServiceLocatorAwareInterface, EntityManagerAwa
            $periodsDetails[$period]['total'] += $total;
            if( $timesheet->getActivity() ){
                $periodsDetails[$period]['total_activities'] += $total;
                $periodsDetails[$period]['total_activities_details'][$timesheet->getActivity()->getId()] += $total;
            } else {
                $periodsDetails[$period]['total_horslots'] += $total;

+23 −0
Changes for public/css/_common.scss: 23 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -132,6 +132,10 @@
    }
  }

  tbody tr {
    border-left: solid 4px #eee;
  }

  .valid-105 {
    .icon-time {
      display: inline-block; color: #3fd53f;
@@ -165,6 +169,25 @@
      display: inline-block; color: #00AA00;
    }
  }

  tr.optionnal {
    border-left-color: #5a5a5a;
  }

  tr.conflict {
    border-left-color: #CC0000;
    background: rgba(#990000, .10);
  }

  tr.validated {
    border-left-color: #00AA00;
    background: rgba(#00AA00, .10);
  }

  tr.validating {
    border-left-color: #0b93d5;
    background: rgba(#0b93d5, .10);
  }
}

.cols {
+18 −0
Changes for public/css/adaj.css: 18 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -5404,6 +5404,9 @@ button.close {
  .declarations-resume .valid-95 .icon-time:before {
    content: '\e840'; }

.declarations-resume tbody tr {
  border-left: solid 4px #eee; }

.declarations-resume .valid-105 .icon-time {
  display: inline-block;
  color: #3fd53f; }
@@ -5426,6 +5429,21 @@ button.close {
  display: inline-block;
  color: #00AA00; }

.declarations-resume tr.optionnal {
  border-left-color: #5a5a5a; }

.declarations-resume tr.conflict {
  border-left-color: #CC0000;
  background: rgba(153, 0, 0, 0.1); }

.declarations-resume tr.validated {
  border-left-color: #00AA00;
  background: rgba(0, 170, 0, 0.1); }

.declarations-resume tr.validating {
  border-left-color: #0b93d5;
  background: rgba(11, 147, 213, 0.1); }

.cols {
  display: flex;
  flex-wrap: wrap; }
+18 −0
Changes for public/css/app-beta.css: 18 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -5404,6 +5404,9 @@ button.close {
  .declarations-resume .valid-95 .icon-time:before {
    content: '\e840'; }

.declarations-resume tbody tr {
  border-left: solid 4px #eee; }

.declarations-resume .valid-105 .icon-time {
  display: inline-block;
  color: #3fd53f; }
@@ -5426,6 +5429,21 @@ button.close {
  display: inline-block;
  color: #00AA00; }

.declarations-resume tr.optionnal {
  border-left-color: #5a5a5a; }

.declarations-resume tr.conflict {
  border-left-color: #CC0000;
  background: rgba(153, 0, 0, 0.1); }

.declarations-resume tr.validated {
  border-left-color: #00AA00;
  background: rgba(0, 170, 0, 0.1); }

.declarations-resume tr.validating {
  border-left-color: #0b93d5;
  background: rgba(11, 147, 213, 0.1); }

.cols {
  display: flex;
  flex-wrap: wrap; }
+18 −0
Changes for public/css/app.css: 18 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -5404,6 +5404,9 @@ button.close {
  .declarations-resume .valid-95 .icon-time:before {
    content: '\e840'; }

.declarations-resume tbody tr {
  border-left: solid 4px #eee; }

.declarations-resume .valid-105 .icon-time {
  display: inline-block;
  color: #3fd53f; }
@@ -5426,6 +5429,21 @@ button.close {
  display: inline-block;
  color: #00AA00; }

.declarations-resume tr.optionnal {
  border-left-color: #5a5a5a; }

.declarations-resume tr.conflict {
  border-left-color: #CC0000;
  background: rgba(153, 0, 0, 0.1); }

.declarations-resume tr.validated {
  border-left-color: #00AA00;
  background: rgba(0, 170, 0, 0.1); }

.declarations-resume tr.validating {
  border-left-color: #0b93d5;
  background: rgba(11, 147, 213, 0.1); }

.cols {
  display: flex;
  flex-wrap: wrap; }
Loading