Merge pull request #139 from suvarnakale/main

Bug fixes - Logout dropdown, EditSchema pop up, Auto attestation enab…
Sunbird-RC · Oct 12, 2023 · a093ddb · a093ddb
2 parents 1bfa92f + edd8132
commit a093ddb
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 12 deletions.
diff --git a/src/app/admin/config-workflow/config-workflow.component.html b/src/app/admin/config-workflow/config-workflow.component.html
@@ -28,7 +28,7 @@ <h4>{{ entityName }}</h4>
           </div>
           <div class="mb-3 d-flex">
             <div class="form-check">
-              <input class="form-check-input" type="radio" disabled [id]="'autoAttestation'+workflowIndex"
+              <input class="form-check-input" type="radio" [id]="'autoAttestation'+workflowIndex"
                 formControlName="attestation_type" value="AUTO_ATTESTATION" [defaultChecked]="true">
               <label class="form-check-label" [for]="'autoAttestation'+workflowIndex">
                 {{'AUTO_ATTESTATION' | translate}}

diff --git a/src/app/admin/config-workflow/config-workflow.component.ts b/src/app/admin/config-workflow/config-workflow.component.ts
@@ -348,7 +348,7 @@ export class ConfigWorkflowComponent implements OnInit {
     return this.fb.group({
       workflowname: '',
       issuancesystem: '',
-      attestation_type: 'MANUAL',  // Currently only support for MANUAL
+      attestation_type: '',  
       attestorConditions: this.fb.array([]),
       additionalInput: {},
       attestationProperties: []

diff --git a/src/app/header/header.component.html b/src/app/header/header.component.html
@@ -32,17 +32,15 @@
           ><img class="logo" src="{{ logo }}"
         /></a>
       </div>
-      <div class="position-absolute text-center mr-48 top-8">
-        <!-- <p class="center">A</p>   -->
-        <span class="fs-12 text-color" *ngIf="loggedInUser">{{ loggedInUser }}</span> &nbsp;
-        <!-- <a *ngIf="loggedInUser" href="/logout" class="fs-12"> <img style="width: 25px;" src="assets/images/logout.png" /></a> -->
-        <span class="dropdown position-relative d-inline-block">
-          <i class="fa fa-chevron-down fs-10 text-color"></i>
-          <div class="dropdown-content">
+      <div class="dropdown position-absolute text-center mr-48 top-8"> 
+          <button class="btn dropdown-toggle fs-12 text-color" type="button" id="dropdownMenuButton"  *ngIf="loggedInUser" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+            {{ loggedInUser }}
+          </button>
+          <div class="dropdown-content" aria-labelledby="dropdownMenuButton">
             <a *ngIf="loggedInUser" href="/logout">Logout</a>
-          </div></span
-        >
-      </div>
+          </div>
+        </div>
+
       <div class="collapse navbar-collapse" id="navbarNavAltMarkup">
         <ng-template [ngIf]="headerSchema?.left">
           <ul class="navbar-nav nav-tabs-line mb-2 mb-lg-0">

diff --git a/src/assets/i18n/global/en-global.json b/src/assets/i18n/global/en-global.json
@@ -23,6 +23,7 @@
 
     "ADD_DOCUMENT": "Add Document",
     "EDIT_TEMPLATE": "Edit Template",
+    "EDIT_SCHEMA": "Edit Schema",
     "DELETE_TEMPLATE": "Delete Template",
     "DELETE_CONFIRM":"Are you sure you want to delete this template?",
     "GENERAL_TEMPLATE": "General Templates",

diff --git a/src/assets/i18n/global/hi-global.json b/src/assets/i18n/global/hi-global.json
@@ -24,6 +24,7 @@
 
   "ADD_DOCUMENT":"दस्तावेज़ जोड़ें",
   "EDIT_TEMPLATE":"टेम्पलेट संपादित करें",
+  "EDIT_SCHEMA": "स्कीमा संपादित करें",
   "DELETE_TEMPLATE": "टेम्पलेट हटाएँ",
   "DELETE_CONFIRM":"क्या आप वाकई इस टेम्पलेट को हटाना चाहते हैं?",
   "GENERAL_TEMPLATE":"सामान्य टेम्पलेट्स",