From 66caf3d6a0d463272257a1225923e08ea80be4cd Mon Sep 17 00:00:00 2001 From: Paras Date: Fri, 8 Oct 2021 14:10:28 +0530 Subject: [PATCH 01/26] dates validation added --- ui-config/forms.json | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/ui-config/forms.json b/ui-config/forms.json index cbe8e86..37281ec 100644 --- a/ui-config/forms.json +++ b/ui-config/forms.json @@ -254,7 +254,8 @@ "name": "expiryYear", "validation": { "pattern": "^[0-9]{4}$", - "message": "Year is not valid. Ex: 2016" + "message": "Year must be less than start date", + "lessThan":"grantYear" } }, { @@ -382,7 +383,10 @@ { "name": "dob", "required": true, - "type": "date" + "type": "date", + "validation": { + "future":true + } }, { "name": "identityHolder" @@ -712,7 +716,10 @@ { "name": "dob", "required": true, - "type": "date" + "type": "date", + "validation": { + "future":true + } }, { "name": "identityHolder", From 986cb8b11b86ba6c68d68acf42c3e00c7a1e3bc9 Mon Sep 17 00:00:00 2001 From: Paras Date: Fri, 8 Oct 2021 14:14:22 +0530 Subject: [PATCH 02/26] local changes --- ui-config/forms.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ui-config/forms.json b/ui-config/forms.json index 37281ec..ed6e85a 100644 --- a/ui-config/forms.json +++ b/ui-config/forms.json @@ -254,8 +254,8 @@ "name": "expiryYear", "validation": { "pattern": "^[0-9]{4}$", - "message": "Year must be less than start date", - "lessThan":"grantYear" + "message": "Year must be less than Grant year", + "greaterThan":"grantYear" } }, { From 815ccda7f99f0c1305d2434801723f989d6d457b Mon Sep 17 00:00:00 2001 From: Paras Date: Mon, 18 Oct 2021 17:06:41 +0530 Subject: [PATCH 03/26] autocomplete config changes --- ui-config/forms.json | 134 +++++++++++++++++++++++++------------------ 1 file changed, 77 insertions(+), 57 deletions(-) diff --git a/ui-config/forms.json b/ui-config/forms.json index ed6e85a..fc4398e 100644 --- a/ui-config/forms.json +++ b/ui-config/forms.json @@ -123,36 +123,6 @@ "validation": { "pattern": "^[0-9]{2}[A-Z]{5}[0-9]{4}[A-Z]{1}[1-9A-Z]{1}Z[0-9A-Z]{1}$", "message": "GSTIN is not valid. Ex: 06BZAHM6385P6Z2" - }, - "autofill": { - "apiURL": "https://appyflow.in/api/verifyGST?gstNo={{value}}&key_secret=XgTCGs0xmLgtBTCqj90sNOJEuL83", - "method": "GET", - "fields": [ - { - "address.plot": "taxpayerInfo.pradr.addr.flno" - }, - { - "address.street": "taxpayerInfo.pradr.addr.st" - }, - { - "address.landmark": "taxpayerInfo.pradr.addr.bnm" - }, - { - "address.locality": "taxpayerInfo.pradr.addr.loc" - }, - { - "address.state": "taxpayerInfo.pradr.addr.stcd" - }, - { - "address.district": "taxpayerInfo.pradr.addr.dst" - }, - { - "address.village": "taxpayerInfo.pradr.addr.city" - }, - { - "address.pincode": "taxpayerInfo.pradr.addr.pncd" - } - ] } }, { @@ -203,7 +173,6 @@ { "name": "adminEmail", "required": true, - "class": "form-check form-check-inline pl-5", "validation": { "pattern": "^[a-zA-Z0-9+_.-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z0-9.-]+$", "message": "Email is not valid." @@ -211,7 +180,11 @@ }, { "name": "adminName", - "class": "form-check form-check-inline pl-5" + "required": true, + "validation": { + "pattern": "^[a-zA-Z]+ [a-zA-Z]+$", + "message": "Name is not valid." + } } ], "except": [ @@ -385,7 +358,7 @@ "required": true, "type": "date", "validation": { - "future":true + "future":false } }, { @@ -426,10 +399,22 @@ { "name": "instituteName", "required": true, - "type": "autocomplete", - "api": "/Institute/search", - "key": "instituteName", - "value": "instituteName", + "autocomplete": { + "apiURL": "https://ndear.xiv.in/registry/api/v1/Institute/search", + "body": { + "filters": { + "instituteName": { + "contains": "{{value}}" + }, + "affiliation._osState": { + "eq": "PUBLISHED" + } + }, + "limit": 20, + "offset": 0 + }, + "responseKey": "instituteName" + }, "autofill": { "apiURL": "https://ndear.xiv.in/registry/api/v1/Institute/search", "method": "POST", @@ -437,7 +422,8 @@ "filters": { "instituteName": { "contains": "{{value}}" - } + }, + "affiliation._osStatus": "PUBLISHED" }, "limit": 20, "offset": 0 @@ -478,14 +464,39 @@ "definition": "ExperienceType", "privacyConfig": "AffiliationOsConfig", "fields": [ - { - "name": "institute", + "name": "instituteOSID", + "custom": true, + "element": { + "widget": { + "formlyConfig": { + "type": "input", + "templateOptions": { + "type": "hidden" + } + } + } + } + }, + { + "name": "instituteName", "required": true, - "type": "autocomplete", - "api": "/Institute/search", - "key": "instituteName", - "value": "instituteName", + "autocomplete": { + "apiURL": "https://ndear.xiv.in/registry/api/v1/Institute/search", + "body": { + "filters": { + "instituteName": { + "contains": "{{value}}" + }, + "affiliation._osState": { + "eq": "PUBLISHED" + } + }, + "limit": 20, + "offset": 0 + }, + "responseKey": "instituteName" + }, "autofill": { "apiURL": "https://ndear.xiv.in/registry/api/v1/Institute/search", "method": "POST", @@ -526,8 +537,8 @@ "name": "end", "type": "date", "validation": { - "lessThan":"start", - "message":"End date must be less than start date" + "greaterThan":"start", + "message":"End date must be greater than start date" } }, { @@ -535,14 +546,11 @@ "required": true }, { - "name": "subjects", - "type": "multiselect", - "required": true - }, - { - "name": "grades", - "type": "multiselect" + "name": "subjectsTaught", + "type":"repeat" }, + + { "name": "attest", "custom": true, @@ -760,10 +768,22 @@ { "name": "institute", "required": true, - "type": "autocomplete", - "api": "/Institute/search", - "key": "instituteName", - "value": "instituteName", + "autocomplete": { + "apiURL": "https://ndear.xiv.in/registry/api/v1/Institute/search", + "body": { + "filters": { + "instituteName": { + "contains": "{{value}}" + }, + "affiliation._osState": { + "eq": "PUBLISHED" + } + }, + "limit": 20, + "offset": 0 + }, + "responseKey": "instituteName" + }, "autofill": { "apiURL": "https://ndear.xiv.in/registry/api/v1/Institute/search", "method": "POST", From 927c7c6ba1b4cd9f443c8face32426467fb610f3 Mon Sep 17 00:00:00 2001 From: Pratiksha Khandagale Date: Tue, 19 Oct 2021 11:46:47 +0530 Subject: [PATCH 04/26] Task #1 feat: Update config --- ui-config/forms.json | 91 ++++++++++++++++++++++++++++++++++++------ ui-config/layouts.json | 16 ++++++-- ui-config/search.json | 33 +++------------ 3 files changed, 97 insertions(+), 43 deletions(-) diff --git a/ui-config/forms.json b/ui-config/forms.json index fc4398e..9318e88 100644 --- a/ui-config/forms.json +++ b/ui-config/forms.json @@ -8,7 +8,8 @@ "type": "entity", "formclass": "row", "header": "default", - "title": "Sign up / Create new account", + "title": "Register", + "isSignupForm":"true", "fieldsets": [ { "definition": "Institute", @@ -24,6 +25,24 @@ "pattern": "^[a-zA-Z0-9+_.-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z0-9.-]+$", "message": "Email is not valid." } + }, + { + "name": "t&c", + "custom": true, + "required": true, + "element": { + "title": "I accept Terms & Conditions ", + "widget": { + "formlyConfig": { + "type": "checkbox", + "fieldGroupClassName": "controls", + "className": "checkbox", + "templateOptions": { + "required": true + } + } + } + } } ] } @@ -173,6 +192,7 @@ { "name": "adminEmail", "required": true, + "class": "form-check form-check-inline pl-5", "validation": { "pattern": "^[a-zA-Z0-9+_.-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z0-9.-]+$", "message": "Email is not valid." @@ -181,6 +201,7 @@ { "name": "adminName", "required": true, + "class": "form-check form-check-inline pl-5", "validation": { "pattern": "^[a-zA-Z]+ [a-zA-Z]+$", "message": "Name is not valid." @@ -268,7 +289,8 @@ "type": "entity", "formclass": "row", "header": "default", - "title": "Sign up / Create new account", + "title": "Register", + "isSignupForm":"true", "fieldsets": [ { "definition": "Teacher", @@ -314,6 +336,23 @@ } ] } + }, + { + "name": "t&c", + "custom": true, + "element": { + "title": "I accept Terms & Conditions ", + "widget": { + "formlyConfig": { + "type": "checkbox", + "fieldGroupClassName": "controls", + "className": "checkbox", + "templateOptions": { + "required": true + } + } + } + } } ] } @@ -579,7 +618,8 @@ "type": "entity", "formclass": "row", "header": "default", - "title": "Sign up / Create new account", + "title": "Register", + "isSignupForm":"true", "fieldsets": [ { "definition": "Student", @@ -650,6 +690,7 @@ "fields": [ { "name": "fullName", + "description" : "as per ID(Aadhaar)", "required": true, "validation": { "pattern": "^[a-zA-Z]+ [a-zA-Z]+$", @@ -683,6 +724,23 @@ } ] } + }, + { + "name": "t&c", + "custom": true, + "element": { + "title": "I accept Terms & Conditions ", + "widget": { + "formlyConfig": { + "type": "checkbox", + "fieldGroupClassName": "controls", + "className": "checkbox", + "templateOptions": { + "required": true + } + } + } + } } ] } @@ -808,18 +866,27 @@ ] } }, + { - "name": "board", - "required": true, - "enum": [{"label": "CBSE Board", "value": "board-cbse"}] - }, - { - "name": "medium", + "name": "class", "required": true }, { - "name": "class", - "required": true + "name": "currStudyHere", + "custom": true, + "element": { + "title": "Currently studying here", + "widget": { + "formlyConfig": { + "type": "checkbox", + "fieldGroupClassName": "controls", + "className": "checkbox", + "templateOptions": { + "required": true + } + } + } + } }, { "name": "documents", @@ -849,4 +916,4 @@ } } ] -} \ No newline at end of file +} diff --git a/ui-config/layouts.json b/ui-config/layouts.json index 62d9483..d0ebf1c 100644 --- a/ui-config/layouts.json +++ b/ui-config/layouts.json @@ -23,7 +23,7 @@ "title": "Affiliation details", "add": true, "addform":"affiliation", - "edit": false, + "claimEdit": true, "editform":"affiliation", "multiple": true, "fields": { @@ -37,6 +37,8 @@ "teacher": { "api": "/Teacher", "title": "Teacher Profile", + "headerName" : "identityDetails.fullName", + "subHeadername" : "contactDetails.address.state,contactDetails.address.city", "blocks": [ { "definition": "Teacher", @@ -54,7 +56,8 @@ "title": "Experience details", "add": true, "addform":"teacher-experience", - "edit": false, + "editform":"teacher-experience", + "claimEdit": true, "multiple": true, "fields": { "includes": ["experience"] @@ -65,7 +68,8 @@ "title": "Academic Qualifications", "add": true, "addform":"teacher-education", - "edit": false, + "editform":"teacher-education", + "claimEdit": true, "multiple": true, "fields": { "includes": ["academicQualifications"] @@ -78,6 +82,8 @@ "student": { "api": "/Student", "title": "Student Profile", + "headerName" : "identityDetails.fullName", + "subHeadername" : "contactDetails.address.state,contactDetails.address.city", "blocks": [ { "definition": "Student", @@ -95,7 +101,9 @@ "title": "Education details", "add": true, "addform":"student-education", + "editform":"student-education", "edit": false, + "claimEdit": true, "multiple": true, "fields": { "includes": ["educationDetails"] @@ -110,4 +118,4 @@ } } ] -} \ No newline at end of file +} diff --git a/ui-config/search.json b/ui-config/search.json index 80063cf..24a6020 100644 --- a/ui-config/search.json +++ b/ui-config/search.json @@ -10,6 +10,7 @@ "tabTitle": "Search Institute", "api": "/Institute/search", "activeTab": "active", + "privateFields": "InstituteOsConfig", "filters": [ { "key": "board", @@ -22,7 +23,6 @@ "type": "autocomplete", "title": "Institute Name", "default": true, - "defaultValue": "any", "propertyPath": "instituteName", "api": "/Institute/search", "placeholder" : "Enter Institute name" @@ -82,6 +82,7 @@ "tab": "teacher", "tabTitle": "Search Teacher", "api": "/Teacher/search", + "privateFields": "TeacherOsConfig", "filters": [ { "key": "board", @@ -129,12 +130,12 @@ { "title" : "Qualification", - "property" : "qualification" + "property" : "academicQualifications.qualification" }, { "title" : "Subject", - "property" : "subject" + "property" : "experience.subjects" }, { @@ -155,6 +156,7 @@ "tab": "student", "tabTitle": "Search Student", "api": "/Student/search", + "privateFields": "StudentOsConfig", "filters": [ { "key": "board", @@ -187,15 +189,6 @@ "propertyPath": "contactDetails.address.pincode" } ], - "results1": { - "fields": [ - "", - "class", - "", - "state", - "district" - ] - }, "results": { "fields": [ { @@ -226,19 +219,5 @@ } } } - ], - "conditions": { - "text": [ - "is", - "is not", - "any" - ], - "date": [ - "is", - ">=", - "<=", - "between", - "any" - ] - } + ] } From f74414bd6444b7bca836b4e2d2d958a66106b519 Mon Sep 17 00:00:00 2001 From: Pratiksha Khandagale Date: Tue, 19 Oct 2021 12:24:08 +0530 Subject: [PATCH 05/26] Task #2 feat: Add header name --- ui-config/layouts.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ui-config/layouts.json b/ui-config/layouts.json index d0ebf1c..2f1493d 100644 --- a/ui-config/layouts.json +++ b/ui-config/layouts.json @@ -6,6 +6,8 @@ "institute": { "api": "/Institute", "title": "Institute Profile", + "headerName" : "instituteName", + "subHeadername" : "address.state,contactDetails.address.city", "blocks": [ { "definition": "Institute", From 9343b36a10fb900570f237fb97fb99d6aa0b432f Mon Sep 17 00:00:00 2001 From: Pratiksha Khandagale Date: Tue, 19 Oct 2021 14:27:20 +0530 Subject: [PATCH 06/26] Task #3 feta: added notes config --- ui-config/forms.json | 45 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/ui-config/forms.json b/ui-config/forms.json index 9318e88..2b4c469 100644 --- a/ui-config/forms.json +++ b/ui-config/forms.json @@ -277,6 +277,21 @@ } } } + }, + { + "name": "notes", + "custom": true, + "element": { + "title": "Note", + "widget": { + "formlyConfig": { + "type": "string", + "fieldGroupClassName": "controls", + "className": "input", + "hideExpression": "!model.attest" + } + } + } } ] } @@ -606,6 +621,21 @@ } } } + }, + { + "name": "notes", + "custom": true, + "element": { + "title": "Note", + "widget": { + "formlyConfig": { + "type": "string", + "fieldGroupClassName": "controls", + "className": "input", + "hideExpression": "!model.attest" + } + } + } } ] } @@ -909,6 +939,21 @@ } } } + }, + { + "name": "notes", + "custom": true, + "element": { + "title": "Note", + "widget": { + "formlyConfig": { + "type": "string", + "fieldGroupClassName": "controls", + "className": "input", + "hideExpression": "!model.attest" + } + } + } } ] } From 2cad95f3c3a91a26a77e0cc5a7e6bb8c7be3e541 Mon Sep 17 00:00:00 2001 From: Pratiksha Khandagale Date: Tue, 19 Oct 2021 14:48:28 +0530 Subject: [PATCH 07/26] Task #5 feat: date format change --- ui-config/tables.json | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/ui-config/tables.json b/ui-config/tables.json index dc33f9b..643d893 100644 --- a/ui-config/tables.json +++ b/ui-config/tables.json @@ -33,7 +33,8 @@ "fields": [ { "name": "createdAt", - "title": "Submited Date" + "title": "Submited Date", + "formate": "date" }, { "name": "requestorName", @@ -56,7 +57,8 @@ "fields": [ { "name": "createdAt", - "title": "Submited Date" + "title": "Submited Date", + "formate": "date" }, { "name": "requestorName", @@ -73,4 +75,4 @@ } } ] -} \ No newline at end of file +} From 18acb1679bb59aacff338fc597b3c947a635cb78 Mon Sep 17 00:00:00 2001 From: Pratiksha Khandagale Date: Fri, 22 Oct 2021 18:05:26 +0530 Subject: [PATCH 08/26] Task #5 feat : Update config --- ui-config/forms.json | 3 +- ui-config/headers.json | 8 ++-- ui-config/search.json | 88 +++++++++--------------------------------- ui-config/tables.json | 1 + 4 files changed, 26 insertions(+), 74 deletions(-) diff --git a/ui-config/forms.json b/ui-config/forms.json index 2b4c469..7c0c742 100644 --- a/ui-config/forms.json +++ b/ui-config/forms.json @@ -660,7 +660,7 @@ "properties": { "above13": { "enum": [ - "Yes" + "No" ] }, "guardianDetails": { @@ -706,6 +706,7 @@ "widget": { "formlyConfig": { "type": "radio", + "defaultValue" : "Yes", "fieldGroupClassName": "controls", "className": "radio" } diff --git a/ui-config/headers.json b/ui-config/headers.json index 8b5fa87..5a14d3f 100644 --- a/ui-config/headers.json +++ b/ui-config/headers.json @@ -17,7 +17,8 @@ "left": [ { "title": "Home", - "redirectTo": "/profile/institute" + "redirectTo": "/profile/institute", + "activeTab" : "active" }, { "title": "Attestations", @@ -26,8 +27,9 @@ ], "right": [ { - "image": "/assets/images/logout.png", - "redirectTo": "/logout" + "title": "Logout", + "redirectTo": "/logout", + "className" : "font-weight-bold" } ] } diff --git a/ui-config/search.json b/ui-config/search.json index 24a6020..22ff042 100644 --- a/ui-config/search.json +++ b/ui-config/search.json @@ -20,12 +20,28 @@ }, { "key": "instituteName", - "type": "autocomplete", + "autocomplete": { + "apiURL": "https://ndear.xiv.in/registry/api/v1/Institute/search", + "body": { + "filters": { + "instituteName": { + "startsWith": "{{value}}" + }, + "affiliation._osState": { + "eq": "PUBLISHED" + } + }, + "limit": 20, + "offset": 0 + }, + "responseKey": "instituteName" + }, + "title": "Institute Name", "default": true, "propertyPath": "instituteName", "api": "/Institute/search", - "placeholder" : "Enter Institute name" + "placeholder" : "Search by Institute name" }, { "key": "state", @@ -150,74 +166,6 @@ ] } } - }, - { - "student": { - "tab": "student", - "tabTitle": "Search Student", - "api": "/Student/search", - "privateFields": "StudentOsConfig", - "filters": [ - { - "key": "board", - "type": "text", - "title": "Board", - "propertyPath": "educationDetails.board" - }, - { - "key": "studentName", - "type": "text", - "title": "Student Name", - "propertyPath": "identityDetails.fullName" - }, - { - "key": "state", - "type": "text", - "title": "State", - "propertyPath": "contactDetails.address.state" - }, - { - "key": "district", - "type": "text", - "title": "District", - "propertyPath": "contactDetails.address.district" - }, - { - "key": "pincode", - "type": "text", - "title": "Pincode", - "propertyPath": "contactDetails.address.pincode" - } - ], - "results": { - "fields": [ - { - "title" : "Student Name", - "property" : "identityDetails.fullName" - }, - { - - "title" : "Class", - "property" : "class" - }, - { - - "title" : "Graduation Year", - "property" : "graduationYear" - }, - { - - "title" : "District", - "property" : "contactDetails.address.district" - }, - { - - "title" : "State", - "property" : "contactDetails.address.state" - } - ] - } - } } ] } diff --git a/ui-config/tables.json b/ui-config/tables.json index 643d893..70f2a76 100644 --- a/ui-config/tables.json +++ b/ui-config/tables.json @@ -1,6 +1,7 @@ { "type": "opensaberLayoutSchema", "version": "0.1", + "limit" : "15", "tables": [ { "teacher-attestation": { From 6c2b1192f87e176f2a63b8aefdfe69ca36b0b5a0 Mon Sep 17 00:00:00 2001 From: Pratiksha Khandagale Date: Fri, 22 Oct 2021 18:19:09 +0530 Subject: [PATCH 09/26] Task #7 feat: bug fixes --- ui-config/forms.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/ui-config/forms.json b/ui-config/forms.json index 7c0c742..d43bccf 100644 --- a/ui-config/forms.json +++ b/ui-config/forms.json @@ -192,7 +192,6 @@ { "name": "adminEmail", "required": true, - "class": "form-check form-check-inline pl-5", "validation": { "pattern": "^[a-zA-Z0-9+_.-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z0-9.-]+$", "message": "Email is not valid." @@ -201,7 +200,6 @@ { "name": "adminName", "required": true, - "class": "form-check form-check-inline pl-5", "validation": { "pattern": "^[a-zA-Z]+ [a-zA-Z]+$", "message": "Name is not valid." From 21623ea4d7dd4f18052a8b32265a28c85265b6cc Mon Sep 17 00:00:00 2001 From: Paras Date: Mon, 25 Oct 2021 10:05:09 +0530 Subject: [PATCH 10/26] forms --- ui-config/forms.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/ui-config/forms.json b/ui-config/forms.json index 2b4c469..872eeee 100644 --- a/ui-config/forms.json +++ b/ui-config/forms.json @@ -192,7 +192,6 @@ { "name": "adminEmail", "required": true, - "class": "form-check form-check-inline pl-5", "validation": { "pattern": "^[a-zA-Z0-9+_.-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z0-9.-]+$", "message": "Email is not valid." @@ -201,7 +200,6 @@ { "name": "adminName", "required": true, - "class": "form-check form-check-inline pl-5", "validation": { "pattern": "^[a-zA-Z]+ [a-zA-Z]+$", "message": "Name is not valid." From bee3a4ff587b0b15b64dbeea2a69dd5bdb6309e5 Mon Sep 17 00:00:00 2001 From: Pratiksha Khandagale Date: Mon, 25 Oct 2021 10:20:01 +0530 Subject: [PATCH 11/26] Task #1 feat: Change label as per new design --- ui-config/forms.json | 15 --------------- ui-config/layouts.json | 8 ++++---- 2 files changed, 4 insertions(+), 19 deletions(-) diff --git a/ui-config/forms.json b/ui-config/forms.json index d43bccf..f170273 100644 --- a/ui-config/forms.json +++ b/ui-config/forms.json @@ -275,21 +275,6 @@ } } } - }, - { - "name": "notes", - "custom": true, - "element": { - "title": "Note", - "widget": { - "formlyConfig": { - "type": "string", - "fieldGroupClassName": "controls", - "className": "input", - "hideExpression": "!model.attest" - } - } - } } ] } diff --git a/ui-config/layouts.json b/ui-config/layouts.json index 2f1493d..b47396b 100644 --- a/ui-config/layouts.json +++ b/ui-config/layouts.json @@ -11,7 +11,7 @@ "blocks": [ { "definition": "Institute", - "title": "Basic details", + "title": "Institute details", "add": false, "edit": true, "editform":"institute-setup", @@ -44,7 +44,7 @@ "blocks": [ { "definition": "Teacher", - "title": "Basic details", + "title": "Personal details", "add": false, "edit": true, "editform":"teacher-setup", @@ -55,7 +55,7 @@ }, { "definition": "Teacher", - "title": "Experience details", + "title": "Professional Experience", "add": true, "addform":"teacher-experience", "editform":"teacher-experience", @@ -67,7 +67,7 @@ }, { "definition": "Teacher", - "title": "Academic Qualifications", + "title": "Education", "add": true, "addform":"teacher-education", "editform":"teacher-education", From 834b9b4dff8e981bc4bcee058670defeaa1cf8ce Mon Sep 17 00:00:00 2001 From: Paras Date: Wed, 27 Oct 2021 16:18:35 +0530 Subject: [PATCH 12/26] issue headers added --- ui-config/headers.json | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/ui-config/headers.json b/ui-config/headers.json index 5a14d3f..408b338 100644 --- a/ui-config/headers.json +++ b/ui-config/headers.json @@ -2,6 +2,10 @@ "type": "opensaberLayoutSchema", "version": "0.1", "headers": [ + { + "blank":{ + } + }, { "default":{ "right":[ @@ -23,6 +27,10 @@ { "title": "Attestations", "redirectTo": "/institute/attestation/institute-attestation" + }, + { + "title": "Issue Certificate", + "redirectTo": "/issue-certificate" } ], "right": [ From 1c5f11f853e86c55ad01d7064b3c0563ed215bef Mon Sep 17 00:00:00 2001 From: Paras Date: Fri, 29 Oct 2021 19:08:08 +0530 Subject: [PATCH 13/26] local --- ui-config/headers.json | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/ui-config/headers.json b/ui-config/headers.json index 408b338..b2f298d 100644 --- a/ui-config/headers.json +++ b/ui-config/headers.json @@ -29,8 +29,8 @@ "redirectTo": "/institute/attestation/institute-attestation" }, { - "title": "Issue Certificate", - "redirectTo": "/issue-certificate" + "title": "Courses", + "redirectTo": "/institute/courses" } ], "right": [ @@ -68,6 +68,10 @@ { "title": "Home", "redirectTo": "/profile/student" + }, + { + "title": "Courses", + "redirectTo": "/Student/courses" } ], "right": [ From 7e92306701ec585dbd926518729aa4ae612eee40 Mon Sep 17 00:00:00 2001 From: Pratiksha Khandagale Date: Fri, 12 Nov 2021 19:07:23 +0530 Subject: [PATCH 14/26] Task #1 feat: Add Autocomplete Configurations --- ui-config/search.json | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/ui-config/search.json b/ui-config/search.json index 22ff042..9e59c42 100644 --- a/ui-config/search.json +++ b/ui-config/search.json @@ -33,14 +33,12 @@ }, "limit": 20, "offset": 0 - }, - "responseKey": "instituteName" + } }, "title": "Institute Name", "default": true, "propertyPath": "instituteName", - "api": "/Institute/search", "placeholder" : "Search by Institute name" }, { From e1bd3dd99964295785fa9419db1c4354bbd83d25 Mon Sep 17 00:00:00 2001 From: Paras Date: Tue, 16 Nov 2021 12:37:50 +0530 Subject: [PATCH 15/26] headers updated --- ui-config/headers.json | 8 -------- 1 file changed, 8 deletions(-) diff --git a/ui-config/headers.json b/ui-config/headers.json index b2f298d..e785b67 100644 --- a/ui-config/headers.json +++ b/ui-config/headers.json @@ -27,10 +27,6 @@ { "title": "Attestations", "redirectTo": "/institute/attestation/institute-attestation" - }, - { - "title": "Courses", - "redirectTo": "/institute/courses" } ], "right": [ @@ -68,10 +64,6 @@ { "title": "Home", "redirectTo": "/profile/student" - }, - { - "title": "Courses", - "redirectTo": "/Student/courses" } ], "right": [ From 5e0c73d98627835e4cc0a47a691249ad77562f87 Mon Sep 17 00:00:00 2001 From: Pratiksha Khandagale Date: Wed, 23 Feb 2022 11:01:57 +0530 Subject: [PATCH 16/26] Task #1 : Add language constant --- ui-config/forms.json | 88 +++++++++++++++++++++++++------------------- 1 file changed, 50 insertions(+), 38 deletions(-) diff --git a/ui-config/forms.json b/ui-config/forms.json index f170273..d336018 100644 --- a/ui-config/forms.json +++ b/ui-config/forms.json @@ -8,8 +8,9 @@ "type": "entity", "formclass": "row", "header": "default", - "title": "Register", + "title": "REGISTER", "isSignupForm":"true", + "langKey" : "institute", "fieldsets": [ { "definition": "Institute", @@ -23,7 +24,7 @@ "required": true, "validation": { "pattern": "^[a-zA-Z0-9+_.-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z0-9.-]+$", - "message": "Email is not valid." + "message": "EMAILT_NOT_VALID" } }, { @@ -31,7 +32,7 @@ "custom": true, "required": true, "element": { - "title": "I accept Terms & Conditions ", + "title": "ACCEPT_TERMS_CONDITIONS", "widget": { "formlyConfig": { "type": "checkbox", @@ -54,12 +55,13 @@ "institute-setup-short": { "api": "/Institute", "type": "entity", - "title": "Institute Setup", + "title": "INSTITUTE_SETUP", "redirectTo": "/profile/institute", + "langKey" : "institute", "fieldsets": [ { "definition": "Institute", - "title": "Basic details", + "title": "BASIC_DETAILS", "formclass": "row", "fields": [ { @@ -70,7 +72,7 @@ "name": "gstnId", "validation": { "pattern": "^[0-9]{2}[A-Z]{5}[0-9]{4}[A-Z]{1}[1-9A-Z]{1}Z[0-9A-Z]{1}$", - "message": "GSTIN is not valid. Ex: 06BZAHM6385P6Z2" + "message": "GSTIN_NOT_VALID" } }, { @@ -83,7 +85,7 @@ "required": true, "validation": { "pattern": "^[a-zA-Z0-9+_.-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z0-9.-]+$", - "message": "Email is not valid." + "message": "EMAILT_NOT_VALID" }, "class": "form-check form-check-inline pl-5" }, @@ -126,12 +128,13 @@ "api": "/Institute", "type": "entity", "title": "Institute Setup", + "langKey" : "institute", "fieldsets": [ { "definition": "Institute", "privacyConfig": "InstituteOsConfig", "globalPrivacyConfig": "public-access", - "title": "Basic details", + "title": "BASIC_DETAILS", "fields": [ { "name": "instituteName", @@ -166,7 +169,7 @@ "required": true, "validation": { "pattern": "^[a-zA-Z0-9+_.-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z0-9.-]+$", - "message": "Email is not valid." + "message": "EMAILT_NOT_VALID" } }, { @@ -194,7 +197,7 @@ "required": true, "validation": { "pattern": "^[a-zA-Z0-9+_.-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z0-9.-]+$", - "message": "Email is not valid." + "message": "EMAILT_NOT_VALID" } }, { @@ -202,7 +205,7 @@ "required": true, "validation": { "pattern": "^[a-zA-Z]+ [a-zA-Z]+$", - "message": "Name is not valid." + "message": "NAME_NOT_VALID" } } ], @@ -218,8 +221,9 @@ "affiliation": { "api": "/Institute", "type": "property:affiliation", - "title": "Affiliation Details", + "title": "AFFLILIATION_DETAILS", "redirectTo": "/profile/institute", + "langKey" : "institute", "fieldsets": [ { "definition": "Affiliation", @@ -232,21 +236,21 @@ { "name": "board", "required": true, - "enum": [{"label": "CBSE Board", "value": "board-cbse"}] + "enum": [{"label": "CBSE_BOARD", "value": "board-cbse"}] }, { "name": "grantYear", "required": true, "validation": { "pattern": "^[0-9]{4}$", - "message": "Year is not valid. Ex: 2016" + "message": "YEAR_NOT_VALID" } }, { "name": "expiryYear", "validation": { "pattern": "^[0-9]{4}$", - "message": "Year must be less than Grant year", + "message": "YEAR_MUST_LESS_GRANT_YEAR", "greaterThan":"grantYear" } }, @@ -263,7 +267,7 @@ "name": "attest", "custom": true, "element": { - "title": "Send for attestation?", + "title": "SEND_FOR_ATTENSTATION", "widget": { "formlyConfig": { "type": "checkbox", @@ -287,8 +291,9 @@ "type": "entity", "formclass": "row", "header": "default", - "title": "Register", + "title": "REGISTER", "isSignupForm":"true", + "langKey" : "teacherStudent", "fieldsets": [ { "definition": "Teacher", @@ -304,7 +309,7 @@ "required": true, "validation": { "pattern": "^[a-zA-Z]+ [a-zA-Z]+$", - "message": "Name is not valid." + "message": "NAME_NOT_VALID" } } ] @@ -321,7 +326,7 @@ "required": true, "validation": { "pattern": "^[a-zA-Z0-9+_.-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z0-9.-]+$", - "message": "Email is not valid." + "message": "EMAILT_NOT_VALID" } }, { @@ -329,7 +334,7 @@ "required": true, "validation": { "pattern": "[6-9]{1}[0-9]{9}", - "message": "Mobile Number must be 10 digit number." + "message": "MOBILE_NO_MUST_10_DIGIT" } } ] @@ -339,7 +344,7 @@ "name": "t&c", "custom": true, "element": { - "title": "I accept Terms & Conditions ", + "title": "ACCEPT_TERMS_CONDITIONS", "widget": { "formlyConfig": { "type": "checkbox", @@ -363,6 +368,7 @@ "api": "/Teacher", "type": "entity", "redirectTo": "/profile/teacher", + "langKey" : "teacherStudent", "fieldsets": [ { "definition": "Teacher", @@ -383,7 +389,7 @@ "required": true, "validation": { "pattern": "^[a-zA-Z]+ [a-zA-Z]+$", - "message": "Name is not valid." + "message": "NAME_NOT_VALID" } }, { @@ -414,6 +420,7 @@ "api": "/Teacher", "type": "property:academicQualifications", "redirectTo": "/profile/teacher", + "langKey" : "teacherStudent", "fieldsets": [ { "definition": "AcademicQualification", @@ -496,6 +503,7 @@ "api": "/Teacher", "type": "property:experience", "redirectTo": "/profile/teacher", + "langKey" : "teacherStudent", "fieldsets": [ { "definition": "ExperienceType", @@ -575,7 +583,7 @@ "type": "date", "validation": { "greaterThan":"start", - "message":"End date must be greater than start date" + "message":"END_DATE_GREATER_THAN_START_DATE" } }, { @@ -592,7 +600,7 @@ "name": "attest", "custom": true, "element": { - "title": "Send for attestation?", + "title": "SEND_FOR_ATTENSTATION", "widget": { "formlyConfig": { "type": "checkbox", @@ -609,7 +617,7 @@ "name": "notes", "custom": true, "element": { - "title": "Note", + "title": "NOTE", "widget": { "formlyConfig": { "type": "string", @@ -631,8 +639,9 @@ "type": "entity", "formclass": "row", "header": "default", - "title": "Register", + "title": "REGISTER", "isSignupForm":"true", + "langKey" : "teacherStudent", "fieldsets": [ { "definition": "Student", @@ -651,11 +660,11 @@ "properties": { "fullName": { "type": "string", - "title": "Guardian's Full Name" + "title": "GUARDIAN_FULL_NAME" }, "relation": { "type": "string", - "title": "Guardian's Relation type" + "title": "GUARDIAN_RELATION_TYPE" } } } @@ -681,7 +690,7 @@ "name": "above13", "custom": true, "element": { - "title": "Are you above 13?", + "title": "ARE_YOU_ABOVE_13", "enum": [ "Yes", "No" @@ -704,11 +713,11 @@ "fields": [ { "name": "fullName", - "description" : "as per ID(Aadhaar)", + "description" : "AS_PER_AADHAAR_ID", "required": true, "validation": { "pattern": "^[a-zA-Z]+ [a-zA-Z]+$", - "message": "Name is not valid." + "message": "NAME_NOT_VALID" } } ] @@ -725,7 +734,7 @@ "required": true, "validation": { "pattern": "^[a-zA-Z0-9+_.-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z0-9.-]+$", - "message": "Email is not valid." + "message": "EMAILT_NOT_VALID" } }, { @@ -733,7 +742,7 @@ "required": true, "validation": { "pattern": "[6-9]{1}[0-9]{9}", - "message": "Mobile Number must be 10 digit number." + "message": "MOBILE_NO_MUST_10_DIGIT" } } ] @@ -743,7 +752,7 @@ "name": "t&c", "custom": true, "element": { - "title": "I accept Terms & Conditions ", + "title": "ACCEPT_TERMS_CONDITIONS", "widget": { "formlyConfig": { "type": "checkbox", @@ -767,6 +776,7 @@ "api": "/Student", "type": "entity", "redirectTo": "/profile/student", + "langKey" : "teacherStudent", "fieldsets": [ { "definition": "Student", @@ -787,11 +797,12 @@ "required": true, "validation": { "pattern": "^[a-zA-Z]+ [a-zA-Z]+$", - "message": "Name is not valid." + "message": "NAME_NOT_VALID" } }, { "name": "gender" + }, { "name": "dob", @@ -818,6 +829,7 @@ "api": "/Student", "type": "property:educationDetails", "redirectTo": "/profile/student", + "langKey" : "teacherStudent", "fieldsets": [ { "definition": "EducationType", @@ -889,7 +901,7 @@ "name": "currStudyHere", "custom": true, "element": { - "title": "Currently studying here", + "title": "CURRENTLY_STUDYING_HERE", "widget": { "formlyConfig": { "type": "checkbox", @@ -911,7 +923,7 @@ "name": "attest", "custom": true, "element": { - "title": "Send for attestation?", + "title": "SEND_FOR_ATTENSTATION", "widget": { "formlyConfig": { "type": "checkbox", @@ -928,7 +940,7 @@ "name": "notes", "custom": true, "element": { - "title": "Note", + "title": "NOTE", "widget": { "formlyConfig": { "type": "string", From ade292b632119240a983cf4044d2f96de106bfaa Mon Sep 17 00:00:00 2001 From: Pratiksha Khandagale Date: Wed, 23 Feb 2022 11:04:03 +0530 Subject: [PATCH 17/26] Task #1 : Add language constant --- ui-config/headers.json | 36 ++++++++++++++-------------- ui-config/layouts.json | 23 ++++++++++-------- ui-config/search.json | 53 +++++++++++++++++++----------------------- ui-config/tables.json | 30 ++++++++++++------------ 4 files changed, 71 insertions(+), 71 deletions(-) diff --git a/ui-config/headers.json b/ui-config/headers.json index e785b67..99a1dbc 100644 --- a/ui-config/headers.json +++ b/ui-config/headers.json @@ -10,7 +10,7 @@ "default":{ "right":[ { - "title": "Login", + "title": "LOGIN", "redirectTo": "/login" } ] @@ -20,18 +20,17 @@ "institute": { "left": [ { - "title": "Home", - "redirectTo": "/profile/institute", - "activeTab" : "active" + "title": "HOME", + "redirectTo": "/profile/institute" }, { - "title": "Attestations", + "title": "ATTESTATIONS", "redirectTo": "/institute/attestation/institute-attestation" } ], "right": [ { - "title": "Logout", + "title": "LOGOUT", "redirectTo": "/logout", "className" : "font-weight-bold" } @@ -42,18 +41,19 @@ "teacher": { "left": [ { - "title": "Home", + "title": "HOME", "redirectTo": "/profile/teacher" }, { - "title": "Attestations", + "title": "ATTESTATIONS", "redirectTo": "/teacher/attestation/teacher-attestation" } ], "right": [ { - "image": "/assets/images/logout.png", - "redirectTo": "/logout" + "title": "LOGOUT", + "redirectTo": "/logout", + "className" : "font-weight-bold" } ] } @@ -62,14 +62,15 @@ "student": { "left": [ { - "title": "Home", + "title": "HOME", "redirectTo": "/profile/student" } ], "right": [ { - "image": "/assets/images/logout.png", - "redirectTo": "/logout" + "title": "LOGOUT", + "redirectTo": "/logout", + "className" : "font-weight-bold" } ] } @@ -78,17 +79,18 @@ "board-cbse": { "left": [ { - "title": "Attestations", + "title": "ATTESTATIONS", "redirectTo": "/profile/board-cbse" } ], "right": [ { - "image": "/assets/images/logout.png", - "redirectTo": "/logout" + "title": "LOGOUT", + "redirectTo": "/logout", + "className" : "font-weight-bold" } ] } } ] -} \ No newline at end of file +} diff --git a/ui-config/layouts.json b/ui-config/layouts.json index b47396b..085e6a1 100644 --- a/ui-config/layouts.json +++ b/ui-config/layouts.json @@ -5,13 +5,14 @@ { "institute": { "api": "/Institute", - "title": "Institute Profile", + "title": "INSTITUTE_PROFILE", + "langKey" : "institute", "headerName" : "instituteName", "subHeadername" : "address.state,contactDetails.address.city", "blocks": [ { "definition": "Institute", - "title": "Institute details", + "title": "INSTITUTE_DEATILS", "add": false, "edit": true, "editform":"institute-setup", @@ -22,7 +23,7 @@ }, { "definition": "Institute", - "title": "Affiliation details", + "title": "AFFILIATION_DETAILS", "add": true, "addform":"affiliation", "claimEdit": true, @@ -38,13 +39,14 @@ { "teacher": { "api": "/Teacher", - "title": "Teacher Profile", + "title": "TEACHER_PROFILE", + "langKey" : "teacherStudent", "headerName" : "identityDetails.fullName", "subHeadername" : "contactDetails.address.state,contactDetails.address.city", "blocks": [ { "definition": "Teacher", - "title": "Personal details", + "title": "PERSONAL_DETAILS", "add": false, "edit": true, "editform":"teacher-setup", @@ -55,7 +57,7 @@ }, { "definition": "Teacher", - "title": "Professional Experience", + "title": "PROFESSIONAL_EXPERIENCE", "add": true, "addform":"teacher-experience", "editform":"teacher-experience", @@ -67,7 +69,7 @@ }, { "definition": "Teacher", - "title": "Education", + "title": "EDUCATION", "add": true, "addform":"teacher-education", "editform":"teacher-education", @@ -83,13 +85,14 @@ { "student": { "api": "/Student", - "title": "Student Profile", + "title": "STUDENT_PROFILE", + "langKey" : "teacherStudent", "headerName" : "identityDetails.fullName", "subHeadername" : "contactDetails.address.state,contactDetails.address.city", "blocks": [ { "definition": "Student", - "title": "Basic details", + "title": "BASIC_DETAILS", "add": false, "edit": true, "editform":"student-setup", @@ -100,7 +103,7 @@ }, { "definition": "Student", - "title": "Education details", + "title": "EDUCATION_DEATILS", "add": true, "addform":"student-education", "editform":"student-education", diff --git a/ui-config/search.json b/ui-config/search.json index 9e59c42..596f685 100644 --- a/ui-config/search.json +++ b/ui-config/search.json @@ -7,7 +7,7 @@ { "institute": { "tab": "institute", - "tabTitle": "Search Institute", + "tabTitle": "SEARCH_INSTITUTE", "api": "/Institute/search", "activeTab": "active", "privateFields": "InstituteOsConfig", @@ -15,7 +15,7 @@ { "key": "board", "type": "text", - "title": "Board", + "title": "BOARD", "propertyPath": "affiliation.board" }, { @@ -36,55 +36,55 @@ } }, - "title": "Institute Name", + "title": "INSTITUTE_NAME", "default": true, "propertyPath": "instituteName", - "placeholder" : "Search by Institute name" + "placeholder" : "SEARCH_BY_INSTITUTE_NAME" }, { "key": "state", "type": "text", - "title": "State", + "title": "STATE", "propertyPath": "address.state" }, { "key": "district", "type": "text", - "title": "District", + "title": "DISTRICT", "propertyPath": "address.district" }, { "key": "pincode", "type": "text", - "title": "Pincode", + "title": "PINCODE", "propertyPath": "address.pincode" } ], "results": { "fields": [ { - "title" : "Institute Name", + "title" : "INSTITUTE_NAME", "property" : "instituteName" }, { - "title" : "District", + "title" : "DISTRICT", "property" : "address.district" }, { - "title" : "State", + "title" : "STATE", "property" : "address.state" }, { - "title" : "Affiliation Number", + "title" : "AFFILIATION_NUMBER", "property" : "affiliation.affiliationNumber" , "attest" : "_osState" }, { - "title" : "Affiliation Classes", + "title" : "AFFILIATION_CLASS", "property" : "affiliation.classes" } ] @@ -94,71 +94,66 @@ { "teacher": { "tab": "teacher", - "tabTitle": "Search Teacher", + "tabTitle": "SEARCH_TEACHER", "api": "/Teacher/search", "privateFields": "TeacherOsConfig", "filters": [ - { - "key": "board", - "type": "text", - "title": "Board", - "propertyPath": "experience.board" - }, + { "key": "teacherName", "type": "text", - "title": "Teacher Name", + "title": "TEACHER_NAME", "propertyPath": "identityDetails.fullName" }, { "key": "subject", "type": "text", - "title": "Subject", + "title": "SUBJECT", "propertyPath": "experience.subjects" }, { "key": "state", "type": "text", - "title": "State", + "title": "STATE", "propertyPath": "contactDetails.address.state" }, { "key": "district", "type": "text", - "title": "District", + "title": "DISTRICT", "propertyPath": "contactDetails.address.district" }, { "key": "pincode", "type": "text", - "title": "Pincode", + "title": "PINCODE", "propertyPath": "contactDetails.address.pincode" } ], "results": { "fields": [ { - "title" : "Teacher Name", + "title" : "TEACHER_NAME", "property" : "identityDetails.fullName" }, { - "title" : "Qualification", + "title" : "QUALIFICATION", "property" : "academicQualifications.qualification" }, { - "title" : "Subject", + "title" : "SUBJECT", "property" : "experience.subjects" }, { - "title" : "District", + "title" : "DISTRICT", "property" : "contactDetails.address.district" }, { - "title" : "State", + "title" : "STATE", "property" : "contactDetails.address.state" } ] diff --git a/ui-config/tables.json b/ui-config/tables.json index 70f2a76..afd0cb3 100644 --- a/ui-config/tables.json +++ b/ui-config/tables.json @@ -6,22 +6,22 @@ { "teacher-attestation": { "api": "/Teacher/claims", - "title": "Teacher Attestations", + "title": "TEACHER_ATTESTATIONS", "fields": [ { "name": "createdAt", - "title": "Submited Date", + "title": "SUBMITTED_DATE", "formate": "date" }, { "name": "requestorName", - "title": "Name" + "title": "NAME" }, { "custom": true, - "title": "Action", + "title": "ACTION", + "buttonText": "ATTEST", "type": "button", - "buttonText": "Attest", "redirectTo": "/Teacher/attestation/teacher-attestation/:id" } ] @@ -30,22 +30,22 @@ { "institute-attestation": { "api": "/Institute/claims", - "title": "Institute Attestations", + "title": "INSTITUTE_ATTESTATIONS", "fields": [ { "name": "createdAt", - "title": "Submited Date", + "title": "SUBMITTED_DATE", "formate": "date" }, { "name": "requestorName", - "title": "Name" + "title": "NAME" }, { "custom": true, - "title": "Action", + "title": "ACTION", "type": "button", - "buttonText": "Attest", + "buttonText": "ATTEST", "redirectTo": "/Institute/attestation/institute-attestation/:id" } ] @@ -54,22 +54,22 @@ { "board-cbse-attestation": { "api": "/board-cbse/claims", - "title": "CBSE Board Attestations", + "title": "CBSE_BOARD_ATTESTATIONS", "fields": [ { "name": "createdAt", - "title": "Submited Date", + "title": "SUBMITTED_DATE", "formate": "date" }, { "name": "requestorName", - "title": "Name" + "title": "NAME" }, { "custom": true, - "title": "Action", + "title": "ACTION", "type": "button", - "buttonText": "Attest", + "buttonText": "ATTEST", "redirectTo": "/board-cbse/attestation/board-cbse-attestation/:id" } ] From ae1b922ff1e3b18518955107e1be56185fb05b5f Mon Sep 17 00:00:00 2001 From: Pratiksha Khandagale Date: Mon, 11 Apr 2022 12:55:48 +0530 Subject: [PATCH 18/26] Task #1: search Institute --- ui-config/forms.json | 14 ++------------ ui-config/search.json | 3 --- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/ui-config/forms.json b/ui-config/forms.json index d336018..6179939 100644 --- a/ui-config/forms.json +++ b/ui-config/forms.json @@ -161,7 +161,7 @@ }, { "name": "contactNumber", - "type": "number", + "type": "string", "required": true }, { @@ -449,9 +449,6 @@ "filters": { "instituteName": { "contains": "{{value}}" - }, - "affiliation._osState": { - "eq": "PUBLISHED" } }, "limit": 20, @@ -466,8 +463,7 @@ "filters": { "instituteName": { "contains": "{{value}}" - }, - "affiliation._osStatus": "PUBLISHED" + } }, "limit": 20, "offset": 0 @@ -532,9 +528,6 @@ "filters": { "instituteName": { "contains": "{{value}}" - }, - "affiliation._osState": { - "eq": "PUBLISHED" } }, "limit": 20, @@ -858,9 +851,6 @@ "filters": { "instituteName": { "contains": "{{value}}" - }, - "affiliation._osState": { - "eq": "PUBLISHED" } }, "limit": 20, diff --git a/ui-config/search.json b/ui-config/search.json index 596f685..7e5dd01 100644 --- a/ui-config/search.json +++ b/ui-config/search.json @@ -26,9 +26,6 @@ "filters": { "instituteName": { "startsWith": "{{value}}" - }, - "affiliation._osState": { - "eq": "PUBLISHED" } }, "limit": 20, From 51bc0e5cb08c3e7177c64d588bcc29a7e93fda9a Mon Sep 17 00:00:00 2001 From: Pratiksha Khandagale Date: Tue, 12 Apr 2022 19:17:07 +0530 Subject: [PATCH 19/26] Task #1 : Updated layout card --- ui-config/layouts.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ui-config/layouts.json b/ui-config/layouts.json index 085e6a1..c059627 100644 --- a/ui-config/layouts.json +++ b/ui-config/layouts.json @@ -29,6 +29,7 @@ "claimEdit": true, "editform":"affiliation", "multiple": true, + "headValue" : "affiliationNumber", "fields": { "includes": ["affiliation"] } @@ -63,6 +64,7 @@ "editform":"teacher-experience", "claimEdit": true, "multiple": true, + "headValue" : "teacherType", "fields": { "includes": ["experience"] } @@ -75,6 +77,7 @@ "editform":"teacher-education", "claimEdit": true, "multiple": true, + "headValue" : "qualification", "fields": { "includes": ["academicQualifications"] } @@ -110,6 +113,7 @@ "edit": false, "claimEdit": true, "multiple": true, + "headValue" : "class", "fields": { "includes": ["educationDetails"] } From 13a495d205a12703b556fe9755b820400440d7bc Mon Sep 17 00:00:00 2001 From: Pratiksha Khandagale Date: Wed, 13 Apr 2022 13:04:47 +0530 Subject: [PATCH 20/26] Task #1 : Added Discovery menu --- ui-config/search.json | 29 ++--------------------------- 1 file changed, 2 insertions(+), 27 deletions(-) diff --git a/ui-config/search.json b/ui-config/search.json index 7e5dd01..e6d5eac 100644 --- a/ui-config/search.json +++ b/ui-config/search.json @@ -27,6 +27,7 @@ "instituteName": { "startsWith": "{{value}}" } + }, "limit": 20, "offset": 0 @@ -49,13 +50,8 @@ "type": "text", "title": "DISTRICT", "propertyPath": "address.district" - }, - { - "key": "pincode", - "type": "text", - "title": "PINCODE", - "propertyPath": "address.pincode" } + ], "results": { "fields": [ @@ -63,11 +59,6 @@ "title" : "INSTITUTE_NAME", "property" : "instituteName" }, - { - - "title" : "DISTRICT", - "property" : "address.district" - }, { "title" : "STATE", @@ -119,12 +110,6 @@ "type": "text", "title": "DISTRICT", "propertyPath": "contactDetails.address.district" - }, - { - "key": "pincode", - "type": "text", - "title": "PINCODE", - "propertyPath": "contactDetails.address.pincode" } ], "results": { @@ -138,16 +123,6 @@ "title" : "QUALIFICATION", "property" : "academicQualifications.qualification" }, - { - - "title" : "SUBJECT", - "property" : "experience.subjects" - }, - { - - "title" : "DISTRICT", - "property" : "contactDetails.address.district" - }, { "title" : "STATE", From 24c29f8521f9889412d754610553898d70bf47f3 Mon Sep 17 00:00:00 2001 From: Pratiksha Khandagale Date: Mon, 25 Apr 2022 17:55:30 +0530 Subject: [PATCH 21/26] Bug #1 fix: Bug fixes --- ui-config/layouts.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ui-config/layouts.json b/ui-config/layouts.json index c059627..667976e 100644 --- a/ui-config/layouts.json +++ b/ui-config/layouts.json @@ -30,6 +30,7 @@ "editform":"affiliation", "multiple": true, "headValue" : "affiliationNumber", + "canRaiseClaim" : true, "fields": { "includes": ["affiliation"] } @@ -65,6 +66,7 @@ "claimEdit": true, "multiple": true, "headValue" : "teacherType", + "canRaiseClaim" : true, "fields": { "includes": ["experience"] } @@ -77,6 +79,7 @@ "editform":"teacher-education", "claimEdit": true, "multiple": true, + "canRaiseClaim" : false, "headValue" : "qualification", "fields": { "includes": ["academicQualifications"] @@ -112,6 +115,7 @@ "editform":"student-education", "edit": false, "claimEdit": true, + "canRaiseClaim" : true, "multiple": true, "headValue" : "class", "fields": { From 9d4b4c514fc52dd5fb10ab81c6d8a1fa49c4d1ba Mon Sep 17 00:00:00 2001 From: Pratiksha Khandagale Date: Fri, 6 May 2022 19:17:45 +0530 Subject: [PATCH 22/26] Issue #45 fixes: Bug Fixes --- ui-config/forms.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ui-config/forms.json b/ui-config/forms.json index 6179939..1f165a4 100644 --- a/ui-config/forms.json +++ b/ui-config/forms.json @@ -174,7 +174,11 @@ }, { "name": "website", - "required": true + "required": true, + "validation": { + "pattern": "((http|https)://)(www.)?[a-zA-Z0-9@:%._\\+~#?&//=]{2,256}\\.[a-z]{2,6}\\b([-a-zA-Z0-9@:%._\\+~#?&//=]*)", + "message": "WEBSITE_NOT_VALID" + } }, { "name": "category", From 0d28ff12c094ba3c126336e33260a9cf5dcd0241 Mon Sep 17 00:00:00 2001 From: Pratiksha Khandagale Date: Thu, 19 May 2022 19:16:48 +0530 Subject: [PATCH 23/26] Task #1: Domain url change --- ui-config/forms.json | 24 +++++++++++++++++------- ui-config/search.json | 2 +- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/ui-config/forms.json b/ui-config/forms.json index 1f165a4..9c4d41b 100644 --- a/ui-config/forms.json +++ b/ui-config/forms.json @@ -448,11 +448,14 @@ "name": "instituteName", "required": true, "autocomplete": { - "apiURL": "https://ndear.xiv.in/registry/api/v1/Institute/search", + "apiURL": "https://demo-education-registry.xiv.in/registry/api/v1/Institute/search", "body": { "filters": { "instituteName": { "contains": "{{value}}" + }, + "instituteAffiliation._osState": { + "eq": "PUBLISHED" } }, "limit": 20, @@ -461,13 +464,14 @@ "responseKey": "instituteName" }, "autofill": { - "apiURL": "https://ndear.xiv.in/registry/api/v1/Institute/search", + "apiURL": "https://demo-education-registry.xiv.in/registry/api/v1/Institute/search", "method": "POST", "body": { "filters": { "instituteName": { "contains": "{{value}}" - } + }, + "instituteAffiliation._osStatus": "PUBLISHED" }, "limit": 20, "offset": 0 @@ -527,11 +531,14 @@ "name": "instituteName", "required": true, "autocomplete": { - "apiURL": "https://ndear.xiv.in/registry/api/v1/Institute/search", + "apiURL": "https://demo-education-registry.xiv.in/registry/api/v1/Institute/search", "body": { "filters": { "instituteName": { "contains": "{{value}}" + }, + "instituteAffiliation._osState": { + "eq": "PUBLISHED" } }, "limit": 20, @@ -540,7 +547,7 @@ "responseKey": "instituteName" }, "autofill": { - "apiURL": "https://ndear.xiv.in/registry/api/v1/Institute/search", + "apiURL": "https://demo-education-registry.xiv.in/registry/api/v1/Institute/search", "method": "POST", "body": { "filters": { @@ -850,11 +857,14 @@ "name": "institute", "required": true, "autocomplete": { - "apiURL": "https://ndear.xiv.in/registry/api/v1/Institute/search", + "apiURL": "https://demo-education-registry.xiv.in/registry/api/v1/Institute/search", "body": { "filters": { "instituteName": { "contains": "{{value}}" + }, + "instituteAffiliation._osState": { + "eq": "PUBLISHED" } }, "limit": 20, @@ -863,7 +873,7 @@ "responseKey": "instituteName" }, "autofill": { - "apiURL": "https://ndear.xiv.in/registry/api/v1/Institute/search", + "apiURL": "https://demo-education-registry.xiv.in/registry/api/v1/Institute/search", "method": "POST", "body": { "filters": { diff --git a/ui-config/search.json b/ui-config/search.json index e6d5eac..96cbd10 100644 --- a/ui-config/search.json +++ b/ui-config/search.json @@ -21,7 +21,7 @@ { "key": "instituteName", "autocomplete": { - "apiURL": "https://ndear.xiv.in/registry/api/v1/Institute/search", + "apiURL": "https://demo-education-registry.xiv.in/registry/api/v1/Institute/search", "body": { "filters": { "instituteName": { From 244d831f62f92412ba52a9dc01edb6ba560c863f Mon Sep 17 00:00:00 2001 From: Chaitrali R Date: Thu, 2 Jun 2022 14:29:23 +0530 Subject: [PATCH 24/26] Bug #51 : Bug fixes --- ui-config/forms.json | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/ui-config/forms.json b/ui-config/forms.json index 9c4d41b..cb88d04 100644 --- a/ui-config/forms.json +++ b/ui-config/forms.json @@ -613,6 +613,7 @@ "templateOptions": { "required": true } + } } } @@ -621,16 +622,28 @@ "name": "notes", "custom": true, "element": { - "title": "NOTE", + "title": "NOTES", "widget": { "formlyConfig": { "type": "string", "fieldGroupClassName": "controls", + "className": "input", - "hideExpression": "!model.attest" + "hideExpression": "!model.attest", + "templateOptions": { + "maxLength":250 + } + + + } + } + + + } + } ] } @@ -944,13 +957,17 @@ "name": "notes", "custom": true, "element": { - "title": "NOTE", + "title": "NOTES", "widget": { "formlyConfig": { "type": "string", "fieldGroupClassName": "controls", "className": "input", - "hideExpression": "!model.attest" + "hideExpression": "!model.attest", + "templateOptions": { + "maxLength":250 + } + } } } From f6d8879b8409d6e2f44c5e6fbc8cd62ec3de05f6 Mon Sep 17 00:00:00 2001 From: Chaitrali R Date: Thu, 2 Jun 2022 15:30:05 +0530 Subject: [PATCH 25/26] Bug #51 : Bug Fixes updated --- ui-config/forms.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ui-config/forms.json b/ui-config/forms.json index cb88d04..d57f201 100644 --- a/ui-config/forms.json +++ b/ui-config/forms.json @@ -622,7 +622,7 @@ "name": "notes", "custom": true, "element": { - "title": "NOTES", + "title": "NOTE", "widget": { "formlyConfig": { "type": "string", @@ -957,7 +957,7 @@ "name": "notes", "custom": true, "element": { - "title": "NOTES", + "title": "NOTE", "widget": { "formlyConfig": { "type": "string", From fc79d7074c65cce45b7e99daddaa176d35c42347 Mon Sep 17 00:00:00 2001 From: Pratiksha Khandagale Date: Fri, 22 Jul 2022 15:43:40 +0530 Subject: [PATCH 26/26] Bug fixes --- ui-config/layouts.json | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/ui-config/layouts.json b/ui-config/layouts.json index 667976e..9c79b4f 100644 --- a/ui-config/layouts.json +++ b/ui-config/layouts.json @@ -19,7 +19,8 @@ "fields": { "includes": ["*"], "excludes": ["affiliation"] - } + }, + "propertyShowFirst" : [ "instituteName", "email"] }, { "definition": "Institute", @@ -33,7 +34,8 @@ "canRaiseClaim" : true, "fields": { "includes": ["affiliation"] - } + }, + "propertyShowFirst" : [ "affiliationNumber", "medium", "grantYear", "expiryYear"] } ] } @@ -55,7 +57,9 @@ "fields": { "includes": ["*"], "excludes": ["experience","academicQualifications"] - } + }, + "propertyShowFirst" : [ "fullName", "mobile", "email"] + }, { "definition": "Teacher", @@ -69,7 +73,8 @@ "canRaiseClaim" : true, "fields": { "includes": ["experience"] - } + }, + "propertyShowFirst" : [ "employmentType", "instituteName"] }, { "definition": "Teacher", @@ -83,7 +88,8 @@ "headValue" : "qualification", "fields": { "includes": ["academicQualifications"] - } + }, + "propertyShowFirst" : [ "qualification", "instituteName", "graduationYear"] } ] } @@ -105,7 +111,8 @@ "fields": { "includes": ["*"], "excludes": ["educationDetails"] - } + }, + "propertyShowFirst" : [ "fullName", "mobile", "email"] }, { "definition": "Student",