Commit d45f70b1 authored by Laurent Lecluse's avatar Laurent Lecluse
Browse files

Merge branches 'develop' and 'master' of https://git.unicaen.fr/open-source/OSE

parents c0315f7d faf7054c

CHANGELOG.md

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ title: "Changements intervenus sur OSE" 
author: Laurent Lécluse - DSI - Unicaen

---



# OSE 10-zf2 et 10-zf3 (à venir)

# OSE 10-zf2 et 10-zf3



## Nouveautés

data/ddl.php

+6 −6
Original line number Diff line number Diff line
@@ -23959,21 +23959,21 @@ END FORMULE_ULHN;', 
      END IF;

















    -- l82=SOMME(L22:L81)









    WHEN c = \'l82\' AND v >= 1 THEN









    -- l522=SOMME(L22:L81)









    WHEN c = \'l522\' AND v >= 1 THEN









      RETURN calcFnc(\'total\',\'l\');

















    -- n=SI($L$82>0;L22/$L$82;0)









    WHEN c = \'n\' AND v >= 1 THEN









      IF cell(\'l82\') > 0 THEN









        RETURN cell(\'l\',l) / cell(\'l82\');









      IF cell(\'l522\') > 0 THEN









        RETURN cell(\'l\',l) / cell(\'l522\');









      ELSE









        RETURN 0;









      END IF;

















    -- o=MIN(service_du;$L$82)*N22









    WHEN c = \'o\' AND v >= 1 THEN









      RETURN LEAST(ose_formule.intervenant.service_du, cell(\'l82\')) * cell(\'n\',l);









      RETURN LEAST(ose_formule.intervenant.service_du, cell(\'l522\')) * cell(\'n\',l);

















    -- p=SI(L22<>0;O22/L22;0)









    WHEN c = \'p\' AND v >= 1 THEN










@@ -23985,7 +23985,7 @@ END FORMULE_ULHN;',















    -- q=SI($L$82>service_du;1-P22;0)









    WHEN c = \'q\' AND v >= 1 THEN









      IF cell(\'l82\') > ose_formule.intervenant.service_du THEN









      IF cell(\'l522\') > ose_formule.intervenant.service_du THEN









        RETURN 1 - cell(\'p\',l);









      ELSE









        RETURN 0;

























module/Application/src/Application/Controller/ServiceController.php



+0
−2






























Original line number
Diff line number
Diff line







@@ -17,8 +17,6 @@ use Application\Service\Traits\LocalContextServiceAwareTrait;







use Application\Service\Traits\ParametresServiceAwareTrait;









use Application\Service\Traits\RegleStructureValidationServiceAwareTrait;









use Application\Service\Traits\WorkflowServiceAwareTrait;









use UnicaenApp\Exporter\Pdf;









use UnicaenApp\View\Model\CsvModel;









use UnicaenApp\View\Model\MessengerViewModel;









use Zend\Http\Request;









use Application\Entity\Db\Intervenant;