Release 3.6.0 into main

package.json

@@ -3,7 +3,7 @@
   "version": "0.0.0",
   "scripts": {
     "ng": "ng",
-    "start": "ng serve",
+    "start": "ng serve Admin-UI",
     "build": "ng build",
     "watch": "ng build --watch --configuration development",
     "test": "ng test",

pom.xml

@@ -5,7 +5,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.iemr.admin-ui</groupId>
   <artifactId>admin-ui</artifactId>
-  <version>3.1.0</version>
+  <version>3.6.0</version>
   <name>Admin-UI</name>
   <description>Piramal - admin: Module ui</description>
 

src/app/app-provider-admin/provider-admin/activities/activities.module.ts

@@ -1,14 +1,5 @@
 import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
-import { MatSelectModule } from '@angular/material/select';
-import { MatInputModule } from '@angular/material/input';
-import { MatFormFieldModule } from '@angular/material/form-field';
-import { MatIconModule } from '@angular/material/icon';
-import { MatDialogModule } from '@angular/material/dialog';
-import { MatDatepickerModule } from '@angular/material/datepicker';
-import { MatNativeDateModule } from '@angular/material/core';
-import { MatTooltipModule } from '@angular/material/tooltip';
-import { MatTableModule } from '@angular/material/table';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { ProviderAdminRoleService } from './services/state-serviceline-role.service';
 import { MaterialModule } from 'src/app/core/material.module';
@@ -19,6 +10,7 @@ import {
 import { CategorySubcategoryProvisioningComponent } from './category-subcategory-provisioning/category-subcategory-provisioning.component';
 import { EditCategorySubcategoryComponent } from './category-subcategory-provisioning/edit-category-subcategory/edit-category-subcategory.component';
 import { EmployeeMasterNewComponent } from './employee-master-new/employee-master-new.component';
+import { EmployeeMasterBulkUploadComponent } from './employee-master-bulk-upload/employee-master-bulk-upload.component';
 import {
   FeedbackTypeMasterComponent,
   EditFeedbackModalComponent,
@@ -108,7 +100,7 @@ import { ProjectConfigutationScreenComponent } from './project-configutation-scr
 import { ProjectConfigurationService } from './services/project-configuration-service';
 import { AddFieldsToProjectComponent } from './add-fields-to-project/add-fields-to-project.component';
 import { AddFieldsService } from './services/add-fields-service';
-import { MatChipGrid, MatChipsModule } from '@angular/material/chips';
+import { MatChipsModule } from '@angular/material/chips';
 import { CoreModule } from 'src/app/core/core.module';
 
 @NgModule({
@@ -161,22 +153,13 @@ import { CoreModule } from 'src/app/core/core.module';
     ProjectServicelineMappingComponent,
     ProjectConfigutationScreenComponent,
     AddFieldsToProjectComponent,
+    EmployeeMasterBulkUploadComponent,
   ],
   imports: [
     CommonModule,
-    MatSelectModule,
-    MatInputModule,
-    MatFormFieldModule,
-    MatIconModule,
-    MatDialogModule,
-    MatDatepickerModule,
-    MatNativeDateModule,
-    MatTooltipModule,
-    MatTableModule,
     MaterialModule,
     FormsModule,
     ReactiveFormsModule,
-    MatNativeDateModule,
     MatChipsModule,
     CoreModule,
   ],

src/app/app-provider-admin/provider-admin/activities/call-disposition-type-master/call-disposition-type-master.component.html

@@ -66,6 +66,7 @@ <h4 class="pull-left">Create Call Disposition Type/Sub Type</h4>
       <div class="table-responsive">
         <table
           mat-table
+          matSort
           [dataSource]="filtereddata"
           class="table table-striped table-hover"
         >
@@ -361,6 +362,7 @@ <h4 class="pull-left">Create Call Disposition Type/Sub Type</h4>
       <div class="table-responsive">
         <table
           mat-table
+          matSort
           [dataSource]="temporarySubtypeArray"
           class="table table-striped table-hover"
         >

src/app/app-provider-admin/provider-admin/activities/category-subcategory-provisioning/category-subcategory-provisioning.component.html

@@ -120,6 +120,7 @@ <h4 class="pull-left">Category and Sub Category Master</h4>
         <table
           *ngIf="showCategoryTable"
           mat-table
+          matSort
           [dataSource]="filtereddata"
           class="table table-striped table-hover"
         >
@@ -216,6 +217,7 @@ <h4 class="pull-left">Category and Sub Category Master</h4>
         <table
           *ngIf="!showCategoryTable"
           mat-table
+          matSort
           [dataSource]="filteredsubCat"
           class="table table-striped table-hover"
         >
@@ -562,6 +564,7 @@ <h4 class="pull-left">Create Category and Sub Category</h4>
       <div class="table-responsive">
         <table
           mat-table
+          matSort
           [dataSource]="this.serviceList"
           class="table table-striped table-hover"
         >
@@ -621,6 +624,7 @@ <h4 class="pull-left">Create Category and Sub Category</h4>
       <div class="table-responsive">
         <table
           mat-table
+          matSort
           [dataSource]="this.serviceSubCatList"
           class="table table-striped table-hover"
         >

src/app/app-provider-admin/provider-admin/activities/device-id-master/device-id-master.component.html

@@ -74,6 +74,7 @@ <h4 class="pull-left">Edit Device ID</h4>
       <div class="table-responsive">
         <table
           mat-table
+          matSort
           [dataSource]="filteredsearchResultArray"
           class="table table-striped table-hover"
         >
@@ -226,6 +227,7 @@ <h4 class="pull-left">Edit Device ID</h4>
       <div class="table-responsive" *ngIf="bufferArray.data.length > 0">
         <table
           mat-table
+          matSort
           [dataSource]="bufferArray"
           class="table table-striped table-hover"
         >

src/app/app-provider-admin/provider-admin/activities/drug-group/drug-group.component.html

@@ -23,6 +23,7 @@ <h4 class="pull-left">Drug Group Master</h4>
       <div class="table-responsive">
         <table
           mat-table
+          matSort
           class="table table-striped table-hover"
           [dataSource]="filteredavailableDrugGroups"
         >
@@ -215,6 +216,7 @@ <h4 *ngIf="editable">Edit Drug Group</h4>
         <div class="table-responsive">
           <table
             mat-table
+            matSort
             [dataSource]="drugGroupList"
             class="table table-striped table-hover"
           >

src/app/app-provider-admin/provider-admin/activities/drug-list/drug-list.component.html

@@ -23,6 +23,7 @@ <h4 class="pull-left">Drug Master</h4>
       <div class="table-responsive">
         <table
           mat-table
+          matSort
           class="table table-striped table-hover"
           [dataSource]="fileteredavailableDrugs"
         >
@@ -230,6 +231,7 @@ <h4 *ngIf="editable">Edit Drug</h4>
         <div class="table-responsive">
           <table
             mat-table
+            matSort
             [dataSource]="drugList"
             class="table table-striped table-hover"
           >

src/app/app-provider-admin/provider-admin/activities/drug-mapping/drug-mapping.component.html

@@ -64,6 +64,7 @@ <h4 *ngIf="!editable && !showMappings">Drug Group-Drug Mapping</h4>
       <div class="table-responsive">
         <table
           mat-table
+          matSort
           class="table table-striped table-hover"
           [dataSource]="filteredavailableDrugMappings"
         >
@@ -232,6 +233,7 @@ <h4 *ngIf="!editable && !showMappings">Drug Group-Drug Mapping</h4>
         <div class="table-responsive">
           <table
             mat-table
+            matSort
             [dataSource]="drugMapping"
             class="table table-striped table-hover"
           >

src/app/app-provider-admin/provider-admin/activities/drug-strength/drug-strength.component.html

@@ -21,6 +21,7 @@ <h4>Drug Strength Master</h4>
       <div class="table-responsive">
         <table
           mat-table
+          matSort
           class="table table-striped table-hover"
           [dataSource]="filteredDrugStrength"
         >
@@ -214,6 +215,7 @@ <h4 *ngIf="editMode && !tableMode">Edit Drug Strength</h4>
       <div class="table-responsive">
         <table
           mat-table
+          matSort
           [dataSource]="drugStrengthList"
           class="table table-striped table-hover"
         >

src/app/app-provider-admin/provider-admin/activities/employee-master-bulk-upload/employee-master-bulk-upload.component.html

@@ -0,0 +1,81 @@
+<div class="container-fluid">
+  <div class="row">
+    <div class="col-xs-12 col-sm-12 m-t-15">
+      <h4>Bulk User Upload</h4>
+    </div>
+    <div>
+      <button
+        mat-raised-button
+        color="primary"
+        class="pull-right mat_blue ml-10"
+        style="margin-right: 10px; margin-top: -10px"
+        (click)="downloadMaster()"
+        label="sample excel"
+      >
+        Download Bulk User Template
+      </button>
+    </div>
+    <div class="overlay" *ngIf="showProgressBar">
+      <div class="overlay-content">
+        <mat-spinner></mat-spinner>
+      </div>
+    </div>
+    <div class="m-t-15" *ngIf="!showUpload">
+      <span class="help-block"
+        >*This user doesn't have 104 serviceline previlage to upload data</span
+      >
+    </div>
+    <form *ngIf="showUpload">
+      <div class="m-t-25">
+        <mat-label for="upload-file" *ngIf="file !== undefined"
+          >Upload File(Size :{{ file.size / 1024 / 1024 | number: "1.2-2" }}/{{
+            maxFileSize
+          }}MB)</mat-label
+        >
+        <mat-label for="upload-file" *ngIf="file === undefined"
+          >Upload File(Size :0/{{ maxFileSize }}MB), Supported File
+          Formats(.xls, .xlsx, .xlsm, .xlsb)</mat-label
+        >
+        <input
+          class="m-t-10"
+          style="margin-left: 60px"
+          id="upload-file"
+          type="file"
+          accept=".xls, .xlsx, .xlsm, .xlsb"
+          size="100"
+          id="upload-file"
+          (change)="onFileUpload($event)"
+          name="fileList"
+          ngModel
+          #uploadfile="ngModel"
+        />
+
+        <span class="help-block" *ngIf="invalid_file_flag"
+          >Supported File Formats(.xls, .xlsx, .xlsm, .xlsb)</span
+        >
+        <span class="help-block" *ngIf="error2"
+          >File size should not exceed {{ maxFileSize }}MB</span
+        >
+      </div>
+      <div class="m-t-20" style="margin-left: 60px; margin-bottom: 20px">
+        <span class="help-block" *ngIf="successcount" style="color: green"
+          >{{ fileuploadedCount }} out of {{ filetotalCount }} users created
+          successfully ! </span
+        ><br />
+        <span class="help-block" *ngIf="errorloglist">{{ errorloglist }}</span>
+      </div>
+    </form>
+    <div class="row col-md-12">
+      <div class="col-md-3">
+        <button
+          mat-raised-button
+          color="primary"
+          class="pull- mat_blue"
+          (click)="back()"
+        >
+          Back
+        </button>
+      </div>
+    </div>
+  </div>
+</div>

src/app/app-provider-admin/provider-admin/activities/employee-master-bulk-upload/employee-master-bulk-upload.component.spec.ts

@@ -0,0 +1,21 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { EmployeeMasterBulkUploadComponent } from './employee-master-bulk-upload.component';
+
+describe('EmployeeMasterBulkUploadComponent', () => {
+  let component: EmployeeMasterBulkUploadComponent;
+  let fixture: ComponentFixture<EmployeeMasterBulkUploadComponent>;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      declarations: [EmployeeMasterBulkUploadComponent],
+    });
+    fixture = TestBed.createComponent(EmployeeMasterBulkUploadComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});