Merge branch 'master' of https://git.swopt.com/swopt/fisapp-ui into swopt-eLeave

src/app/app.component.scss

@@ -18,6 +18,7 @@
     margin: 5px;
     height: calc(100vh - 65px);
     max-width: 1920px;
+    overflow-y: auto;
 }
 
 .container > .right {

src/app/dashboard/dashboard.component.html

@@ -14,19 +14,22 @@
             <login/>
           </div>
         } @else {
-          <mat-expansion-panel class="segment" expanded="true">
-            <mat-expansion-panel-header>
-              <mat-panel-title>
-                <h2>{{'eleave'|tr:'eLeave'}}</h2>
-              </mat-panel-title>
-            </mat-expansion-panel-header>
+          <div class="segment">
+            <h3>{{'eleave'|tr:'eLeave'}}</h3>
+            <mat-divider></mat-divider>
             <div class="dashitems">
               <leave-submission-dashitem></leave-submission-dashitem>
-              @if (this.hasAccess.leaveApproval) {
-                <leave-approval-dashitem></leave-approval-dashitem>
-              }
+              <leave-approval-dashitem></leave-approval-dashitem>
+              <leave-info-dashitem></leave-info-dashitem>
             </div>
-          </mat-expansion-panel>
+          </div>
+          <div class="segment">
+            <h3>{{'spts'|tr:'SPTS'}}</h3>
+            <mat-divider></mat-divider>
+            <div class="dashitems">
+              <sales-tender-submission-dashitem></sales-tender-submission-dashitem>
+            </div>
+          </div>
         }
         <div class="social-links">
           

src/app/dashboard/dashboard.component.scss

@@ -78,11 +78,15 @@ main {
 }
 .content .left {
   display: flex;
-  width: 20%;
   flex-direction: column;
   align-items: center;
 }
 
+.content .left,.right {
+  flex-grow: 1;
+  min-width: 17%;
+}
+
 .content .center {
   flex-grow: 1;
 }
@@ -98,22 +102,18 @@ main {
   flex-direction: column;
   align-items: center;
   gap: 1.5rem;
-  margin-bottom: 1rem;
 }
 .content .center .segment {
   margin-bottom: 0.5rem;
+  mat-divider {margin-bottom: 0.5rem;}
 }
 
-.content .center .dashitems {
-  display: flex;
-  flex-wrap: wrap;
+.content .center .segment .dashitems {
+  display: grid;
+  grid-template-columns: 33% 33% 33%;
   gap: 0.5rem;
 }
 
-.content .right {
-  width: 20%;
-}
-
 .divider {
   width: 1px;
   background: var(--red-to-pink-to-purple-vertical-gradient);
@@ -218,10 +218,20 @@ main {
     width: 100%;
   }
 
+  .content .center .segment .dashitems {
+    grid-template-columns: 100%;
+  }
+
   .divider {
     height: 1px;
     width: 100%;
     background: var(--red-to-pink-to-purple-horizontal-gradient);
     margin-block: 1.5rem;
   }
+}
+
+@media screen and (pointer: none), (pointer: coarse) and (orientation=landscape) {
+  .content .center .segment .dashitems {
+    grid-template-columns: 50% 50%;
+  }
 }

src/dependencies/angularlib

@@ -1 +1 @@
-Subproject commit cdc370a69bdade6ca511260a48b6b52cb8cc6ef1
+Subproject commit b72a8f5a3748233718a091f39c20b549ff8d52fb

src/dependencies/dp-ui

@@ -1 +1 @@
-Subproject commit e405e83ddc3c3cf7e9db4cd50b29f38faeae9d04
+Subproject commit 542d8c496e706bcf9ec4b36837cc840c939da395

src/dependencies/fis

@@ -1 +1 @@
-Subproject commit 271fe002a2f1d3529ba6682a9185202319aca687
+Subproject commit a758ba54267c04106738f2fa1c2b14bb1dfb0039