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

…stration-sohith Cbrelease 4.8.20 custom registration sohith
KB-iGOT · Nov 27, 2024 · 9ca5d27 · 9ca5d27
2 parents 7070c22 + 0d54fa1
commit 9ca5d27
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 18 deletions.
diff --git a/package.json b/package.json
@@ -43,7 +43,7 @@
     "@babel/core": "7.22.0",
     "@babel/preset-env": "7.25.4",
     "@project-sunbird/telemetry-sdk": "0.0.26",
-    "@sunbird-cb/collection": "1.0.48-ang-13-16",
+    "@sunbird-cb/collection": "1.0.49-ang-13-16",
     "@sunbird-cb/rain-dashboards": "0.0.36-ang-13-16",
     "@sunbird-cb/resolver": "1.0.0-ang-13-16",
     "@sunbird-cb/taxonomy-editor": "0.0.0-ang-13-16",

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
@@ -155,19 +155,7 @@ export class CreateOrganisationComponent implements OnInit, OnDestroy {
       logo: this.selectedLogo,
       description: this.controls['description'].value,
       parentMapId: this.heirarchyObject?.parentMapId || "",
-      sbRootOrgId: this.heirarchyObject?.parentMapId || "",
-    }
-
-    if (this.controls['category'].value === "state") {
-      payload.organisationType = this.controls['state'].value.sbOrgType
-      payload.organisationSubType = this.controls['state'].value.sbOrgSubType
-      payload.parentMapId = this.controls['state'].value.parentMapId
-      payload.sbRootOrgId = this.controls['state'].value.sbOrgId
-    } else {
-      payload.organisationType = this.controls['ministry'].value.sbOrgType
-      payload.organisationSubType = this.controls['ministry'].value.sbOrgSubType
-      payload.parentMapId = this.controls['ministry'].value.parentMapId
-      payload.sbRootOrgId = this.controls['ministry'].value.sbOrgId
+      sbRootOrgId: this.heirarchyObject?.sbRootOrgId || "",
     }
 
     if (this.openMode === 'editMode') {

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
@@ -292,7 +292,9 @@ export class UIDirectoryTableComponent implements OnInit, AfterViewInit, OnChang
   }
 
   organizationCreatedEmit(_event: any) {
-    this.searchByEnterKey.emit('')
+    setTimeout(() => {
+      this.searchByEnterKey.emit('')
+    }, 1000)
 
   }
 

diff --git a/src/themes/_theme-mixins.scss b/src/themes/_theme-mixins.scss
@@ -227,7 +227,7 @@
         position: absolute;
         border-color: $colorAccentDark;
         border-style: solid;
-        border-width: 0 0 0 2px;
+        border-width: 0 0 0 4px;
         right: 0;
         height: inherit;
       }
@@ -374,11 +374,12 @@
       &::after {
         content: '';
         position: absolute;
-        border-color: #347bb6;
+        border-color: #1B4CA1;
         border-style: solid;
-        border-width: 0 0 0 2px;
+        border-width: 0 0 0 4px;
         right: 0;
         height: inherit;
+        top: 0;
       }
     }