Commit 4650c544 authored by Stephane Bouvry's avatar Stephane Bouvry
Browse files

Versements : Fix UI 

Déclarations de temps : UI
parent a1aa6e9c

ui/src/styles/_oscar-other.scss

+33 −32
Original line number Diff line number Diff line
@@ -846,33 +846,34 @@ a.usage { 
  &.status-1.past {

    border-color: #ff3605;

  }

  &:hover .heading nav {

  &:hover nav {

    opacity: 1;

  }



  .heading {

    display: flex;

    justify-content: center;

    align-content: stretch;

    .amount {

      flex: 50%;

      flex: 30%;

      text-align: right;

      font-size: 1.5em;

      font-size: 1.2em;

      padding-right: .3em;

      white-space: nowrap;

      border-right: dotted $colorGreyUltraLight thin;

    }

    .date {

      padding-left: .3em;

      flex: 50%;

      font-size: .9em;

      flex: 70%;

      font-weight: 100;

    }

    nav {

      flex: 0;

      opacity: .5;

//      opacity: .5;



      border-left: thin lighten($colorGreyUltraLight, 15%) solid;

      a {

        color: $colorGreyUltraLight;

        &:hover {

          color: $colorGreyLight;

        }
@@ -896,37 +897,37 @@ a.usage { 
  }

}



// BOUTONS

.btn-iconed {

  &:before {

    font-family: fontello;

    content: '\e871';

  }

}

//// BOUTONS

//.btn-iconed {

//  &:before {

//    font-family: fontello;

//    content: '\e871';

//  }

//}



.btn-edit, .btn-delete, .btn-save {



}



.btn-edit:before {

  content: '\e882';

}



.btn-delete:before {

  content: '\e866';

}



.btn-save:before {

  content: '\e890';

}



.btn-lock:before {

  content: '\e8a5';

}



.btn-unlock:before {

  content: '\e8a6';

}

//.btn-edit:before {

//  //content: '\e882';

//}

//

//.btn-delete:before {

//  content: '\e866';

//}

//

//.btn-save:before {

//  content: '\e890';

//}

//

//.btn-lock:before {

//  content: '\e8a5';

//}

//

//.btn-unlock:before {

//  content: '\e8a6';

//}



////////////////////////////////// LISTE des ACTIVITES

#bottom-flash-menu {

ui/src/styles/_oscar-timesheet.scss

+2 −2
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ $onColor: color.adjust($baseColor, $saturation: 25%); 
    line-height: 2em;

  }

}



/*

[class*="icon-"] {

  text-align: center;

}
@@ -76,7 +76,7 @@ $onColor: color.adjust($baseColor, $saturation: 25%); 
    color: white;

  }

}



*/



.timesheet-item {

  background: color.adjust($offColor, $lightness: 50%);

ui/src/views/ActivityPayments.vue

+4 −3
Original line number Diff line number Diff line
@@ -137,8 +137,9 @@ export default { 
          break;

        case 'ecarts' :

          now.setDate(now.getDate()+30);

          this.to = now.toISOString().substring(0, 10);

          this.type = 1;

          this.from = "";

          this.to = ""; //now.toISOString().substring(0, 10);

          this.type = 3;

          break;



      }
@@ -186,7 +187,7 @@ export default { 
      // this.urlSend = url;

      let url = "?";



      console.log(this.from);

      console.log("Type", this.type);



      url += "&type=" + (this.type?this.type:"");

      url += "&to=" + (this.to?this.to:"");

ui/src/views/Payments.vue

+1 −0
Original line number Diff line number Diff line
@@ -162,6 +162,7 @@ 
        fetch

      </button>

    </nav>



    <payment v-for="p in payments" :payment="p" :key="p.id" :manage="manage"

             @delete="handlerDelete"

             @edit="handlerEdit"/>

ui/src/views/TimesheetDeclaration.vue

+29 −0
Original line number Diff line number Diff line
@@ -704,6 +704,35 @@ 
    </section>

  </section>

</template>

<style>

.wp-duration {

  display: flex;

  flex-direction: row;

  > strong {

    flex: 5;

  }

  .total, .left {

    flex: 1;

  }

  .left {

    flex: 0 0 4em;

  }

}

.buttons-icon.left {

  display: flex;

  flex-direction: row;

  i {

    color: var(--bs-primary);

    text-align: center;

    flex: auto;

    &:hover {

    cursor: pointer;

      background: var(--bs-primary);

      color: var(--bs-primary-light);

    }

  }

}

</style>





<script>