Commit 2a4f8e03 authored by Stephane Bouvry's avatar Stephane Bouvry
Browse files

Ajout des liens vers les activités dans les notifications, il faudra... 

Ajout des liens vers les activités dans les notifications, il faudra transmettre le gabarit des URL au JS par un moyen quelquonque.
parent d5c0d270

module/Oscar/src/Oscar/Service/NotificationService.php

+4 −0
Changes for module/Oscar/src/Oscar/Service/NotificationService.php: 4 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -67,6 +67,10 @@ class NotificationService implements ServiceLocatorAwareInterface, EntityManager 
        }

    }



    public function notifyActivitiesTimesheetReject( $activities ){



    }



    public function notification( $message, $personsId, $context='Application', $contextId=-1, $key=null)

    {

        if ($key === null) {

module/Oscar/src/Oscar/Service/TimesheetService.php

+7 −0
Changes for module/Oscar/src/Oscar/Service/TimesheetService.php: 7 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -358,6 +358,13 @@ class TimesheetService implements ServiceLocatorAwareInterface, EntityManagerAwa 
                return $this->getResponseBadRequest("DOBEFORE");

            }

        }



        try {

//            $this->getServiceLocator()->get('NotificationService')->notifyActivitiesTimesheetValidationSci($activityNotification);

        } catch ( \Exception $e ){

            //$this->getServiceLocator()->get('Logger')->error($e->getMessage() ." - " . $e->getTraceAsString());

        }



        return $timesheets;

    }

module/Oscar/view/oscar/project-grant/show.phtml

+0 −63
Changes for module/Oscar/view/oscar/project-grant/show.phtml: 0 added lines, 63 removed lines.
Original line number Diff line number Diff line
@@ -494,69 +494,6 @@ if( $this->grant()->privilege(\Oscar\Provider\Privileges::ACTIVITY_WORKPACKAGE_S 
        })

    </script>

    <?php endif; ?>



    <?php /*<section id="workpackage">

        <h2><i class="icon-archive"></i> Lot de travail</h2>

        <section class="workpackages">

            <?php foreach( $entity->getWorkPackages() as $wp ): ?>

            <article class="workpackage-item">

                <h3>

                    <span class="code"><?= $wp->getCode() ?></span>

                    <span class="label"><?= $wp->getLabel() ?></span>

                </h3>

                <p><?= $wp->getDescription() ?></p>

                <nav>

                    <?php if( $manage ): ?>

                        <span class="dropdown">

                            <a class="dropdown-toggle"

                                    type="button" id="dropdownMenu1"

                                    data-toggle="dropdown"

                                    aria-haspopup="true" aria-expanded="true">

                                Gérer <span class="caret"></span>

                            </a>

                            <ul class="dropdown-menu" aria-labelledby="dropdownMenu1">

                                <li>

                                    <a href="<?= $this->url('workpackage/edit', ['id'=>$wp->getId()]) ?>" class="">

                                        <i class="icon-edit"></i>&nbsp;Modifier

                                    </a>

                                </li>

                                <li>

                                    <a data-confirm="Supprimer ce lot de travail ?" data-href="<?= $this->url('workpackage/delete', ['id'=>$wp->getId()]) ?>" class="">

                                        <i class="icon-trash"></i>&nbsp;Supprimer

                                    </a>

                                </li>

                            </ul>

                        </span>

                    <?php endif; ?>

                    <a href="" class="disabled">

                        <i class="icon-clock"></i>&nbsp;Déclarer mes heures

                    </a>

                </nav>

            </article>

            <?php endforeach; ?>

        </section>



        <nav class="btn-bar">

            <?php if( $manage ): ?>

            <a href="<?= $this->url('workpackage/new', ['idactivity' => $entity->getId() ]) ?>" class="btn btn-primary">Nouveau lot</a>

            <?php endif; ?>

        <?php if( DEBUG_OSCAR && $this->grant()->getCurrentPerson() ): ?>

            <nav>

                <a href="<?= $this->url('timesheet/declaration2', ['idactivity' => $entity->getId()]) ?>"  class="btn btn-primary">

                    Déclarer mes heures pour cette activités

                </a>



                <?php if( $this->grant()->privilege(\Oscar\Provider\Privileges::ACTIVITY_WORKPACKAGE_VALIDATE,['idactivity' => $entity->getId()])): ?>



                    <a href="<?= $this->url('timesheet/validation', ['idactivity' => $entity->getId()]) ?>"

                       class="btn btn-primary">

                        Valider les déclarations

                    </a>

                <?php endif; ?>

            </nav>

        <?php endif; ?>

    </section>

 <?php */ ?>

    <?php endif; ?>



    <?php if( $this->grant()->privilege(\Oscar\Provider\Privileges::MAINTENANCE_MENU_ADMIN) ): ?>

public/css/app.css

+4 −0
Changes for public/css/app.css: 4 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -8372,6 +8372,10 @@ time.date-missing { 
        background: white; }

        #notifications-area .list article:hover h4 a {

          color: #333; }

      #notifications-area .list article a {

        color: #455790; }

        #notifications-area .list article a:hover {

          background: transparent; }



@keyframes fresh {

  from {

public/css/app.scss

+6 −0
Changes for public/css/app.scss: 6 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -3008,6 +3008,12 @@ $oscar-line: dotted thin $colorGreyLight; 
          color: #333;

        }

      }

      a {

        color: $brand-primary;

        &:hover {

          background: transparent;

        }

      }

    }

  }

}