Commit 08914bdc authored by Laurent Lecluse's avatar Laurent Lecluse
Browse files

Bug TI / + col 0

parent 213ac7a1

module/Enseignement/src/View/Helper/EnseignementsViewHelper.php

+2 −2
Original line number Diff line number Diff line
@@ -154,7 +154,7 @@ class EnseignementsViewHelper extends AbstractViewHelper 
        foreach ($typesIntervention as $ti) {

            $display = $this->getTypeInterventionVisibility($ti) ? '' : ';display:none';

            $colspan++;

            $out .= "<th class=\"heures type-intervention " . $ti->getCode() . "\" style=\"width:8%$display\"><abbr title=\"" . $ti->getLibelle() . "\">" . $ti->getCode() . "</abbr></th>\n";

            $out .= "<th class=\"heures type-intervention ti" . $ti->getId() . "\" style=\"width:8%$display\"><abbr title=\"" . $ti->getLibelle() . "\">" . $ti->getCode() . "</abbr></th>\n";

        }

        $out .= "<th>&nbsp;</th>\n";

        $out .= "</tr>\n";
@@ -444,7 +444,7 @@ class EnseignementsViewHelper extends AbstractViewHelper 
            } else {

                $display = ';display:none';

            }

            $out .= "<td id=\"" . $ti->getCode() . "\" class=\"type-intervention " . $ti->getCode() . "\" style=\"text-align:right$display\">" . \UnicaenApp\Util::formattedNumber($data[$ti->getCode()]) . "</td>\n";

            $out .= "<td id=\"" . $ti->getCode() . "\" class=\"type-intervention ti" . $ti->getId() . "\" style=\"text-align:right$display\">" . \UnicaenApp\Util::formattedNumber($data[$ti->getCode()]) . "</td>\n";

        }

        $out .= "<td>&nbsp;</td>\n";

        $out .= "</tr>\n";

module/Enseignement/src/View/Helper/LigneEnseignementViewHelper.php

+7 −20
Original line number Diff line number Diff line
@@ -24,15 +24,7 @@ class LigneEnseignementViewHelper extends AbstractViewHelper 






    /**

     * Helper entry point.

     *

     * @param Enseignements $enseignements

     * @param Service       $service

     *

     * @return self

     */

    final public function __invoke(EnseignementsViewHelper $enseignements, Service $service)

    final public function __invoke(EnseignementsViewHelper $enseignements, Service $service): self

    {

        $this->enseignements = $enseignements;

        $this->setService($service);
@@ -42,12 +34,7 @@ class LigneEnseignementViewHelper extends AbstractViewHelper 






    /**

     * Retourne le code HTML généré par cette aide de vue.

     *

     * @return string

     */

    public function __toString()

    public function __toString(): string

    {

        return $this->render();

    }
@@ -236,11 +223,11 @@ class LigneEnseignementViewHelper extends AbstractViewHelper 
        $display = $this->enseignements->getTypeInterventionVisibility($liste->getTypeIntervention()) ? '' : ';display:none';



        $attribs = [

            'class'                       => 'heures type-intervention ' . $liste->getTypeIntervention()->getCode(),

            'class'                     => 'heures type-intervention ti' . $liste->getTypeIntervention()->getId(),

            'style'                     => 'text-align:right' . $display,

            'id'                        => 'service-' . $liste->getService()->getId() . '-ti-' . $liste->getTypeIntervention()->getId(),

            'data-value'                => $heures,

            'data-type-intervention-code' => $liste->getTypeIntervention()->getCode(),

            'data-type-intervention-id' => $liste->getTypeIntervention()->getId(),

        ];

        $out     = '<td ' . $this->htmlAttribs($attribs) . '>';

        if ($hasForbiddenPeriodes) $out .= '<abbr class="bg-danger" title="Des heures sont renseignées sur une période non conforme à la période de l\'enseignement">';

public/js/service.js

+9 −9
Original line number Diff line number Diff line
@@ -11,13 +11,13 @@ $.widget("ose.enseignements", { 
        for (var i in this.totaux) {

            if (this.totaux[i] != 0) {

                count++;

                this.element.find("table.service tr th." + i).show(); // entête

                this.element.find("table.service tr.service-ligne td.type-intervention." + i).show();

                this.element.find("table.service tfoot tr td." + i).show(); // total

                this.element.find("table.service tr th.ti" + i).show(); // entête

                this.element.find("table.service tr.service-ligne td.type-intervention.ti" + i).show();

                this.element.find("table.service tfoot tr td.ti" + i).show(); // total

            } else {

                this.element.find("table.service tr th." + i).hide(); // entête

                this.element.find("table.service tr.service-ligne td.type-intervention." + i).hide();

                this.element.find("table.service tfoot tr td." + i).hide(); // total

                this.element.find("table.service tr th.ti" + i).hide(); // entête

                this.element.find("table.service tr.service-ligne td.type-intervention.ti" + i).hide();

                this.element.find("table.service tfoot tr td.ti" + i).hide(); // total

            }

        }

        this.element.find("table.service #total-general").attr('colspan', count);
@@ -35,11 +35,11 @@ $.widget("ose.enseignements", { 
        this.total = 0;



        this.element.find("table.service tr.service-ligne td.type-intervention").each(function () {

            var typeInterventionCode = $(this).data('type-intervention-code');

            var typeInterventionId = $(this).data('type-intervention-id');

            var value = $(this).data('value');

            if (that.totaux[typeInterventionCode] == undefined) that.totaux[typeInterventionCode] = 0;

            if (that.totaux[typeInterventionId] == undefined) that.totaux[typeInterventionId] = 0;



            that.totaux[typeInterventionCode] += value;

            that.totaux[typeInterventionId] += value;

            that.total += value;

        });