Commit 6e1a688e authored by Stephane Bouvry's avatar Stephane Bouvry
Browse files

Amélioration de l'UI de gestion des déclarations

parent 2295967c

module/Oscar/src/Oscar/Controller/TimesheetController.php

+5 −1
Original line number Diff line number Diff line
@@ -2065,9 +2065,13 @@ class TimesheetController extends AbstractOscarController 
    public function declarationsAction()

    {

        $this->getOscarUserContext()->check(Privileges::MAINTENANCE_VALIDATION_MANAGE);

        $method = $this->getHttpXMethod();



        if( $method == 'POST' ){

            return  $this->getResponseNotImplemented();

        }



        if( $this->isAjax() ){

            $method = $this->getHttpXMethod();

            switch ($method) {

                case 'GET' :

                $return = $this->getTimesheetService()->getDatasDeclarations();

public/css/_common.scss

+34 −5
Original line number Diff line number Diff line
@@ -254,6 +254,31 @@ 
.declarations-ui {

  background: #e2e2e2;

  height: 80vh;



  .list-item {

    font-size: .8em;

    background: #eee;

    transition: all .3s;

    display: block;

    cursor: pointer;

    white-space: nowrap;

    text-overflow: ellipsis;

    overflow: hidden;

    max-width: 175px;

    margin-bottom: 2px;

    &:hover {

      background: #fff;

    }

    &.selected {

      background: $colorGreyBlack;

      color:#eee;

    }

  }



  .persons-list {

    padding-left: .5em;

    max-height: 100%;

    overflow-y: auto;

  }



  .declarations-list {
@@ -261,6 +286,10 @@ 
    overflow-y: auto;

    padding-right: .5em;

  }

}











.data-list {

public/css/adaj.css

+24 −5
Original line number Diff line number Diff line
@@ -5540,8 +5540,27 @@ button.close { 
.declarations-ui {

  background: #e2e2e2;

  height: 80vh; }



.declarations-list {

  .declarations-ui .list-item {

    font-size: .8em;

    background: #eee;

    transition: all .3s;

    display: block;

    cursor: pointer;

    white-space: nowrap;

    text-overflow: ellipsis;

    overflow: hidden;

    max-width: 175px;

    margin-bottom: 2px; }

    .declarations-ui .list-item:hover {

      background: #fff; }

    .declarations-ui .list-item.selected {

      background: #222;

      color: #eee; }

  .declarations-ui .persons-list {

    padding-left: .5em;

    max-height: 100%;

    overflow-y: auto; }

  .declarations-ui .declarations-list {

    max-height: 100%;

    overflow-y: auto;

    padding-right: .5em; }

public/css/app-beta.css

+24 −5
Original line number Diff line number Diff line
@@ -5540,8 +5540,27 @@ button.close { 
.declarations-ui {

  background: #e2e2e2;

  height: 80vh; }



.declarations-list {

  .declarations-ui .list-item {

    font-size: .8em;

    background: #eee;

    transition: all .3s;

    display: block;

    cursor: pointer;

    white-space: nowrap;

    text-overflow: ellipsis;

    overflow: hidden;

    max-width: 175px;

    margin-bottom: 2px; }

    .declarations-ui .list-item:hover {

      background: #fff; }

    .declarations-ui .list-item.selected {

      background: #222;

      color: #eee; }

  .declarations-ui .persons-list {

    padding-left: .5em;

    max-height: 100%;

    overflow-y: auto; }

  .declarations-ui .declarations-list {

    max-height: 100%;

    overflow-y: auto;

    padding-right: .5em; }

public/css/app.css

+24 −5
Original line number Diff line number Diff line
@@ -5540,8 +5540,27 @@ button.close { 
.declarations-ui {

  background: #e2e2e2;

  height: 80vh; }



.declarations-list {

  .declarations-ui .list-item {

    font-size: .8em;

    background: #eee;

    transition: all .3s;

    display: block;

    cursor: pointer;

    white-space: nowrap;

    text-overflow: ellipsis;

    overflow: hidden;

    max-width: 175px;

    margin-bottom: 2px; }

    .declarations-ui .list-item:hover {

      background: #fff; }

    .declarations-ui .list-item.selected {

      background: #222;

      color: #eee; }

  .declarations-ui .persons-list {

    padding-left: .5em;

    max-height: 100%;

    overflow-y: auto; }

  .declarations-ui .declarations-list {

    max-height: 100%;

    overflow-y: auto;

    padding-right: .5em; }