Commit 6d3f9779 authored by Kostis Trantzas's avatar Kostis Trantzas
Browse files

Merge branch 'develop' into 'main' 

MR for Release 2024Q4

See merge request !18
parents a4e155b8 acfa930d

.gitlab-ci.yml

+2 −2
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ include: 
      - ci-templates/default.yml

      - ci-templates/build.yml

    rules:

      - if: '$CI_COMMIT_REF_PROTECTED && $CI_COMMIT_REF_NAME != "main" && $CI_COMMIT_REF_NAME != "develop"'

      - if: '$CI_COMMIT_REF_PROTECTED == "true" && $CI_COMMIT_REF_NAME != "main" && $CI_COMMIT_REF_NAME != "develop"'



  - project: osl/code/org.etsi.osl.main

    ref: develop
@@ -29,7 +29,7 @@ include: 
      - ci-templates/default.yml

      - ci-templates/build_unprotected.yml

    rules:

      - if: '$CI_COMMIT_REF_NAME != "main" && $CI_COMMIT_REF_NAME != "develop" && !$CI_COMMIT_REF_PROTECTED'

      - if: '$CI_COMMIT_REF_NAME != "main" && $CI_COMMIT_REF_NAME != "develop" && $CI_COMMIT_REF_PROTECTED == "false"'



angular_build:

  extends: .angular_build

src/app/p_resources/admin/inventoryManagement/preview-resource/preview-resource.component.html

+1 −1
Original line number Diff line number Diff line
@@ -146,7 +146,7 @@ 
                                    {{ note.text }}

                                    <div class="small">

                                      written by {{ note.author }} @

                                      {{ note.date | date: "d MMM y, h:mm a" }}

                                      {{ note.date | date: "d MMM y, h:mm:ss a" }}

                                    </div>

                                  </div>

                                </div>

src/app/p_resources/admin/inventoryManagement/preview-resource/preview-resource.component.scss

+5 −0
Original line number Diff line number Diff line
@@ -14,3 +14,8 @@ 
.tab-pane > .card:nth-child(1) {

    min-height: max(350px, 20vh);

}



.notes-container {

    max-height: 265px;

    overflow-y: auto;

}
 
 No newline at end of file

src/app/p_resources/admin/resourcePoolManagement/resource-reservation-calendar/resource-reservation-calendar.component.ts

+1 −1
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ export class ResourceReservationCalendarComponent implements OnInit { 
            this.reservations

            ).map(function(eventEl: Reservation) {

              

              console.info("this is event: " + eventEl.id +" " + eventEl.requestedPeriodStartDateTime  )

              // console.info("this is event: " + eventEl.id +" " + eventEl.requestedPeriodStartDateTime  )

              // var result = new Date(eventEl.startDate);

              // var evd = result.toISOString().replace(/T.*$/, ''); // YYYY-MM-DD of today

src/app/p_services/admin/orderManagement/list-service-orders/list-service-orders.component.ts

+1 −1
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ export class ListServiceOrdersComponent implements OnInit { 
            this.serviceOrders

            ).map(function(eventEl: ServiceOrder) {

              

              console.info("this is event: " + eventEl.id +" " + eventEl.requestedStartDate )

              // console.info("this is event: " + eventEl.id +" " + eventEl.requestedStartDate )

              // var result = new Date(eventEl.startDate);

              // var evd = result.toISOString().replace(/T.*$/, ''); // YYYY-MM-DD of today