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

…stration-sohith Cbrelease 4.8.20 custom registration sohith
KB-iGOT · Nov 27, 2024 · f3e5eea · f3e5eea
2 parents 9ca5d27 + 01f4896
commit f3e5eea
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 12 deletions.
diff --git a/...t/ws/app/src/lib/head/ui-admin-table/create-organisation/create-organisation.component.ts b/...t/ws/app/src/lib/head/ui-admin-table/create-organisation/create-organisation.component.ts
@@ -148,7 +148,8 @@ export class CreateOrganisationComponent implements OnInit, OnDestroy {
       orgName: this.controls['organisationName'].value,
       channel: this.controls['organisationName'].value,
       organisationType: this.heirarchyObject?.sbOrgType || "",
-      organisationSubType: this.heirarchyObject?.sbOrgSubType || "",
+      // organisationSubType: this.heirarchyObject?.sbOrgSubType || "",
+      organisationSubType: "board",
       isTenant: true,
       requestedBy: this.loggedInUserId,
 
@@ -190,7 +191,8 @@ export class CreateOrganisationComponent implements OnInit, OnDestroy {
     const payload = {
       orgName: request.orgName,
       channel: request.channel,
-      organisationSubType: this.heirarchyObject.sbOrgSubType,
+      // organisationSubType: this.heirarchyObject.sbOrgSubType,
+      organisationSubType: "board",
       orgId: this.rowData.id,
       logo: request.logo,
       description: request.description

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
@@ -36,9 +36,13 @@
               </div> -->
 
               <ng-container *ngIf="!initialData.QRGenerated">
-                <div class="flex justify-center items-center">
-                  <button mat-flat-button class="mat-btn-flat" [disabled]="selfRegistrationForm.invalid || isLoading"
-                    (click)="generateQRCodeLink()">Generate</button>
+                <div class="flex justify-center items-center flex-column gap-6">
+                  <!-- <button mat-flat-button class="mat-btn-flat" [disabled]="selfRegistrationForm.invalid || isLoading"
+                    (click)="generateQRCodeLink()">Generate</button> -->
+
+                  <div class="mx-auto">
+                    <mat-spinner [diameter]="30" [strokeWidth]="3"></mat-spinner>
+                  </div>
                 </div>
               </ng-container>
 
@@ -123,7 +127,6 @@
                 </div>
               </ng-container>
 
-
             </form>
           </ng-container>
 
@@ -135,14 +138,13 @@
         </div>
 
         <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="!initialData.QRGenerated">
+          <!-- <ng-container *ngIf="!initialData.QRGenerated">
             <button mat-flat-button class="mat-btn-outline" (click)="closeNaveBar()">Cancel</button>
             <button mat-flat-button class="mat-btn-flat" [disabled]="!initialData?.QRGenerated">{{initialData?.openMode
               === 'edit' ? 'Update' : 'Add'}}</button>
-          </ng-container>
+          </ng-container> -->
           <ng-container *ngIf="initialData.QRGenerated">
             <button mat-flat-button class="mat-btn-flat" (click)="closeNaveBar()">Close</button>
-
           </ng-container>
 
         </div>

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
@@ -47,15 +47,17 @@ export class CustomSelfRegistrationComponent implements OnInit, OnDestroy {
       endDate: ['',]
     })
 
-    if (this.initialData.qrRegistrationLink && this.initialData.startDateRegistration && this.initialData.endDateRegistration) {
-      this.selfRegistrationForm.get('startDate')?.setValue(new Date(this.initialData.startDateRegistration))
-      this.selfRegistrationForm.get('endDate')?.setValue(new Date(this.initialData.endDateRegistration))
+    if (this.initialData.qrRegistrationLink) {
+      // this.selfRegistrationForm.get('startDate')?.setValue(new Date(this.initialData.startDateRegistration))
+      // this.selfRegistrationForm.get('endDate')?.setValue(new Date(this.initialData.endDateRegistration))
       const links = {
         registrationLink: this.initialData.registrationLink,
         qrRegistrationLink: this.initialData.qrRegistrationLink
       }
       this.customRegistrationLinks = links
       this.initialData.QRGenerated = true
+    } else {
+      this.generateQRCodeLink()
     }
   }