Merge pull request #102 from Sohith-code/cbrelease-4.8.20-custom-regi…

…stration-sohith Removed startdate, enddate and gradedroup, and other minror fixes
KB-iGOT · Nov 26, 2024 · 7070c22 · 7070c22
2 parents ddf53dd + d1694d7
commit 7070c22
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 25 deletions.
diff --git a/...ws/app/src/lib/head/ui-admin-table/create-organisation/create-organisation.component.html b/...ws/app/src/lib/head/ui-admin-table/create-organisation/create-organisation.component.html
@@ -214,7 +214,8 @@
         <div class="right-sidenav-footer flex items-center justify-end gap-4 items-center px-5 pt-3 pb-5 bg-white">
           <ng-container *ngIf="openMode !== 'viewMode'">
             <button mat-button class="cancelButton" (click)="closeNaveBar()">Cancel</button>
-            <button mat-flat-button class="mat-btn-flat" [disabled]="isLoading || this.organisationForm.invalid"
+            <button mat-flat-button class="mat-btn-flat"
+              [disabled]="isLoading || this.organisationForm.invalid || !selectedLogo"
               (click)="onSubmitCreateOrganization()">{{openMode
               === 'editMode' ? 'Update' : 'Add'}}</button>
           </ng-container>

diff --git a/.../lib/head/ui-admin-table/custom-self-registration/custom-self-registration.component.html b/.../lib/head/ui-admin-table/custom-self-registration/custom-self-registration.component.html
@@ -10,7 +10,7 @@
         <div class="px-5 pt-6 mb-24">
           <ng-container>
             <form [formGroup]="selfRegistrationForm">
-              <div class="flex items-center justify-between ">
+              <!-- <div class="flex items-center justify-between ">
                 <div class="flex flex-column gap-1 w-full formfield-rounded-full max-w-240">
                   <div class="flex items-center gap-1 required">
                     <span class="lable">Start Date</span>
@@ -33,7 +33,7 @@
                     <mat-datepicker #endDate></mat-datepicker>
                   </mat-form-field>
                 </div>
-              </div>
+              </div> -->
 
               <ng-container *ngIf="!initialData.QRGenerated">
                 <div class="flex justify-center items-center">

diff --git a/...rc/lib/head/ui-admin-table/custom-self-registration/custom-self-registration.component.ts b/...rc/lib/head/ui-admin-table/custom-self-registration/custom-self-registration.component.ts
@@ -1,5 +1,5 @@
 import { Component, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angular/core'
-import { FormBuilder, FormGroup, Validators } from '@angular/forms'
+import { FormBuilder, FormGroup } from '@angular/forms'
 import { CreateMDOService } from '../create-mdo.services'
 import { CustomRegistrationQRCodeResponse } from '../interface/interfaces'
 import { MatSnackBar } from '@angular/material/snack-bar'
@@ -43,8 +43,8 @@ export class CustomSelfRegistrationComponent implements OnInit, OnDestroy {
 
   initializeForm(): void {
     this.selfRegistrationForm = this.formBuilder.group({
-      startDate: ['', [Validators.required]],
-      endDate: ['', [Validators.required]]
+      startDate: ['',],
+      endDate: ['',]
     })
 
     if (this.initialData.qrRegistrationLink && this.initialData.startDateRegistration && this.initialData.endDateRegistration) {
@@ -85,8 +85,8 @@ export class CustomSelfRegistrationComponent implements OnInit, OnDestroy {
 
     this.isLoading = true
     const payload = {
-      registrationStartDate: (Math.floor(this.selfRegistrationForm.controls['startDate'].value.getTime())),
-      registrationEndDate: (Math.floor(this.selfRegistrationForm.controls['endDate'].value.getTime())),
+      // registrationStartDate: (Math.floor(this.selfRegistrationForm.controls['startDate'].value.getTime())),
+      // registrationEndDate: (Math.floor(this.selfRegistrationForm.controls['endDate'].value.getTime())),
       orgId: this.initialData.orgId
     }
     this.createMdoService.generateSelfRegistrationQRCode(payload).subscribe({

diff --git a/project/ws/app/src/lib/head/ui-admin-table/directory-list/directory-table.component.html b/project/ws/app/src/lib/head/ui-admin-table/directory-list/directory-table.component.html
@@ -76,8 +76,8 @@
                                         Management</button>
                                     <button mat-menu-item (click)="goToRoute('designation_master', row)">Manage
                                         Designations</button>
-                                    <button mat-menu-item
-                                        (click)="goToRoute('grade_setting', row)">Grades/Group</button>
+                                    <!-- <button mat-menu-item
+                                        (click)="goToRoute('grade_setting', row)">Grades/Group</button> -->
                                 </ng-template>
                             </mat-menu>
                         </ng-container>

diff --git a/project/ws/app/src/lib/head/ui-admin-table/directory-list/directory-table.component.ts b/project/ws/app/src/lib/head/ui-admin-table/directory-list/directory-table.component.ts
@@ -291,8 +291,8 @@ export class UIDirectoryTableComponent implements OnInit, AfterViewInit, OnChang
     })
   }
 
-  organizationCreatedEmit(event: any) {
-    this.searchByEnterKey.emit(event.orgName)
+  organizationCreatedEmit(_event: any) {
+    this.searchByEnterKey.emit('')
 
   }
 

diff --git a/project/ws/app/src/lib/head/ui-admin-table/user-list/ui-admin-user-table.component.html b/project/ws/app/src/lib/head/ui-admin-table/user-list/ui-admin-user-table.component.html
@@ -24,7 +24,7 @@
                     <mat-icon>vertical_align_bottom</mat-icon> Consumption Report
                 </button>
             </div>
-            <div style="margin-right: 7px;" *ngIf="!isReports">
+            <div *ngIf="!isReports">
                 <button mat-raised-button type="button" *ngIf="needCreateUser"
                     class="text-white ws-mat-primary-background text-white margin-right-l custom-btn"
                     (click)="gotoCreateUser()">

diff --git a/project/ws/app/src/lib/routes/create-mdo/routes/users/users.component.ts b/project/ws/app/src/lib/routes/create-mdo/routes/users/users.component.ts
@@ -75,12 +75,12 @@ export class UsersComponent implements OnInit, AfterViewInit, OnDestroy {
         render: true,
         enabled: true,
       },
-      {
-        name: 'Grade/Group setting',
-        key: 'grade_setting',
-        render: true,
-        enabled: true,
-      },
+      // {
+      //   name: 'Grade/Group setting',
+      //   key: 'grade_setting',
+      //   render: true,
+      //   enabled: true,
+      // },
     ]
 
     const url = this.router.url.split('/')

diff --git a/project/ws/app/src/lib/routes/home/routes/directory/directroy.component.ts b/project/ws/app/src/lib/routes/home/routes/directory/directroy.component.ts
@@ -60,7 +60,7 @@ export class DirectoryViewComponent implements OnInit {
       this.currentFilter = params['tab']
       this.currentTab = params['tab']
       if (this.currentFilter === null || this.currentFilter === undefined) {
-        this.currentFilter = 'mdo'
+        this.currentFilter = 'organisation'
       }
     })
     this.getAllDepartmentsHeaderAPI()
@@ -93,7 +93,7 @@ export class DirectoryViewComponent implements OnInit {
         columns: [
           { displayName: 'Organisation', key: 'organisation' },
           { displayName: 'Type', key: 'type' },
-          { displayName: 'Created By', key: 'createdBy' },
+          // { displayName: 'Created By', key: 'createdBy' },
           { displayName: 'Created On', key: 'createdOn' },
         ],
         actions: [{ name: '', label: '', icon: 'remove_red_eye', type: 'menu' }],
@@ -332,6 +332,7 @@ export class DirectoryViewComponent implements OnInit {
 
         }
       })
+      this.data = [...this.data]
       this.tabledata.loader = false
       // this.data.sort((a: any, b: any) => {
       //   const textA = a.mdo.trimStart().toUpperCase()

diff --git a/project/ws/app/src/lib/routes/home/services/directory.services.ts b/project/ws/app/src/lib/routes/home/services/directory.services.ts
@@ -40,10 +40,10 @@ export class DirectoryService {
             status: 1,
           },
           sortBy: {
-            orgName: 'asc',
+            createdDate: 'desc',
           },
           query: queryText,
-          limit: 500,
+          limit: 1000,
         },
       }
       return this.http.post<any>(`${API_END_POINTS.GET_ALL_DEPARTMENT_KONG}`, req1)
@@ -53,9 +53,9 @@ export class DirectoryService {
       request: {
         filters,
         sortBy: {
-          orgName: 'asc',
+          createdDate: 'desc',
         },
-        limit: 500,
+        limit: 1000,
       },
     }
     return this.http.post<any>(`${API_END_POINTS.GET_ALL_DEPARTMENT_KONG}`, req)