Merge branch 'cbrelease-4.8.21' of https://github.com/KB-iGOT/sunbird-cb-adminportal into cios-via-api

Author: mansurskTarento

project/ws/app/src/lib/routes/create-mdo/routes/designation/components/bulk-upload/bulk-upload.component.html

@@ -64,37 +64,41 @@
             {{ list?.status !== 'SUCCESSFUL' ? 'Download error log' : 'Download file' }}
           </div>
         </div>
-        <div class="grid grid-flow-row sm:grid-flow-col gap-10 grid-col grid-container-25">
-          <div class="flex flex-col">
+        <div class="flex flex-wrap">
+          <div class="flex flex-col w-full box">
             <div class="label">Name</div>
             <div class="value">{{ list?.fileName }}</div>
           </div>
-          <div class="flex flex-col">
+          <div class="flex flex-col w-full box">
             <div class="label">Status</div>
             <div class="value">{{ list?.status }}</div>
           </div>
-          <div class="flex flex-col">
+          <div class="flex flex-col w-full box">
             <div class="label">Failed Records</div>
             <div class="value">{{ list?.failedRecordsCount }}</div>
           </div>
-          <div class="flex flex-col">
+          <div class="flex flex-col w-full box">
             <div class="label">Success Records</div>
             <div class="value">{{ list?.successfulRecordsCount }}</div>
           </div>
         </div>
-        <div class="grid grid-flow-row sm:grid-flow-col gap-10 grid-col grid-container-25">
-          <div class="flex flex-col">
+        <div class="flex flex-wrap">
+          <div class="flex flex-col w-full box">
             <div class="label">Total Records</div>
             <div class="value">{{ list?.totalRecords }}</div>
           </div>
-          <div class="flex flex-col">
+          <div class="flex flex-col w-full box">
             <div class="label">Initiated On</div>
             <div class="value">{{ list?.dateCreatedOn | date: 'dd MMM yyyy h:mm a' }}</div>
           </div>
-          <div class="flex flex-col">
+          <div class="flex flex-col w-full box">
             <div class="label">Completed On</div>
             <div class="value">{{ list?.dateUpdatedOn | date: 'dd MMM yyyy h:mm a' }}</div>
           </div>
+          <div class="flex flex-col w-full box">
+            <div class="label">Uploaded By</div>
+            <div class="value">{{ list?.userDetails?.firstName }}</div>
+          </div>
         </div>
       </div>
     </div>

project/ws/app/src/lib/routes/create-mdo/routes/designation/components/bulk-upload/bulk-upload.component.scss

@@ -15,6 +15,7 @@
     line-height: 18px;
     color: rgba($color: #000000, $alpha: 0.88);
     word-break: break-all;
+    width: 95%;
   }
 
   .outline-button {
@@ -76,6 +77,11 @@
   }
 }
 
+.box {
+  flex: 1 1 calc(25% - 10px);
+  box-sizing: border-box;
+}
+
 @media screen and (max-width: 641px) {
   ::ng-deep .common-modal, ::ng-deep .progress-modal {
     max-width: 90vw !important;