diff --git a/ui-config/forms.json b/ui-config/forms.json index cbe8e86..d57f201 100644 --- a/ui-config/forms.json +++ b/ui-config/forms.json @@ -8,7 +8,9 @@ "type": "entity", "formclass": "row", "header": "default", - "title": "Sign up / Create new account", + "title": "REGISTER", + "isSignupForm":"true", + "langKey" : "institute", "fieldsets": [ { "definition": "Institute", @@ -22,7 +24,25 @@ "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" + } + }, + { + "name": "t&c", + "custom": true, + "required": true, + "element": { + "title": "ACCEPT_TERMS_CONDITIONS", + "widget": { + "formlyConfig": { + "type": "checkbox", + "fieldGroupClassName": "controls", + "className": "checkbox", + "templateOptions": { + "required": true + } + } + } } } ] @@ -35,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": [ { @@ -51,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" } }, { @@ -64,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" }, @@ -107,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", @@ -123,36 +145,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" - } - ] } }, { @@ -169,7 +161,7 @@ }, { "name": "contactNumber", - "type": "number", + "type": "string", "required": true }, { @@ -177,12 +169,16 @@ "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" } }, { "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", @@ -203,15 +199,18 @@ { "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." + "message": "EMAILT_NOT_VALID" } }, { "name": "adminName", - "class": "form-check form-check-inline pl-5" + "required": true, + "validation": { + "pattern": "^[a-zA-Z]+ [a-zA-Z]+$", + "message": "NAME_NOT_VALID" + } } ], "except": [ @@ -226,8 +225,9 @@ "affiliation": { "api": "/Institute", "type": "property:affiliation", - "title": "Affiliation Details", + "title": "AFFLILIATION_DETAILS", "redirectTo": "/profile/institute", + "langKey" : "institute", "fieldsets": [ { "definition": "Affiliation", @@ -240,21 +240,22 @@ { "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 is not valid. Ex: 2016" + "message": "YEAR_MUST_LESS_GRANT_YEAR", + "greaterThan":"grantYear" } }, { @@ -270,7 +271,7 @@ "name": "attest", "custom": true, "element": { - "title": "Send for attestation?", + "title": "SEND_FOR_ATTENSTATION", "widget": { "formlyConfig": { "type": "checkbox", @@ -294,7 +295,9 @@ "type": "entity", "formclass": "row", "header": "default", - "title": "Sign up / Create new account", + "title": "REGISTER", + "isSignupForm":"true", + "langKey" : "teacherStudent", "fieldsets": [ { "definition": "Teacher", @@ -310,7 +313,7 @@ "required": true, "validation": { "pattern": "^[a-zA-Z]+ [a-zA-Z]+$", - "message": "Name is not valid." + "message": "NAME_NOT_VALID" } } ] @@ -327,7 +330,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" } }, { @@ -335,11 +338,28 @@ "required": true, "validation": { "pattern": "[6-9]{1}[0-9]{9}", - "message": "Mobile Number must be 10 digit number." + "message": "MOBILE_NO_MUST_10_DIGIT" } } ] } + }, + { + "name": "t&c", + "custom": true, + "element": { + "title": "ACCEPT_TERMS_CONDITIONS", + "widget": { + "formlyConfig": { + "type": "checkbox", + "fieldGroupClassName": "controls", + "className": "checkbox", + "templateOptions": { + "required": true + } + } + } + } } ] } @@ -352,6 +372,7 @@ "api": "/Teacher", "type": "entity", "redirectTo": "/profile/teacher", + "langKey" : "teacherStudent", "fieldsets": [ { "definition": "Teacher", @@ -372,7 +393,7 @@ "required": true, "validation": { "pattern": "^[a-zA-Z]+ [a-zA-Z]+$", - "message": "Name is not valid." + "message": "NAME_NOT_VALID" } }, { @@ -382,7 +403,10 @@ { "name": "dob", "required": true, - "type": "date" + "type": "date", + "validation": { + "future":false + } }, { "name": "identityHolder" @@ -400,6 +424,7 @@ "api": "/Teacher", "type": "property:academicQualifications", "redirectTo": "/profile/teacher", + "langKey" : "teacherStudent", "fieldsets": [ { "definition": "AcademicQualification", @@ -422,18 +447,31 @@ { "name": "instituteName", "required": true, - "type": "autocomplete", - "api": "/Institute/search", - "key": "instituteName", - "value": "instituteName", + "autocomplete": { + "apiURL": "https://demo-education-registry.xiv.in/registry/api/v1/Institute/search", + "body": { + "filters": { + "instituteName": { + "contains": "{{value}}" + }, + "instituteAffiliation._osState": { + "eq": "PUBLISHED" + } + }, + "limit": 20, + "offset": 0 + }, + "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 @@ -469,21 +507,47 @@ "api": "/Teacher", "type": "property:experience", "redirectTo": "/profile/teacher", + "langKey" : "teacherStudent", "fieldsets": [ { "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://demo-education-registry.xiv.in/registry/api/v1/Institute/search", + "body": { + "filters": { + "instituteName": { + "contains": "{{value}}" + }, + "instituteAffiliation._osState": { + "eq": "PUBLISHED" + } + }, + "limit": 20, + "offset": 0 + }, + "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": { @@ -522,8 +586,8 @@ "name": "end", "type": "date", "validation": { - "lessThan":"start", - "message":"End date must be less than start date" + "greaterThan":"start", + "message":"END_DATE_GREATER_THAN_START_DATE" } }, { @@ -531,19 +595,16 @@ "required": true }, { - "name": "subjects", - "type": "multiselect", - "required": true - }, - { - "name": "grades", - "type": "multiselect" + "name": "subjectsTaught", + "type":"repeat" }, + + { "name": "attest", "custom": true, "element": { - "title": "Send for attestation?", + "title": "SEND_FOR_ATTENSTATION", "widget": { "formlyConfig": { "type": "checkbox", @@ -552,9 +613,37 @@ "templateOptions": { "required": true } + + } + } + } + }, + { + "name": "notes", + "custom": true, + "element": { + "title": "NOTE", + "widget": { + "formlyConfig": { + "type": "string", + "fieldGroupClassName": "controls", + + "className": "input", + "hideExpression": "!model.attest", + "templateOptions": { + "maxLength":250 + } + + + } + } + + + } + } ] } @@ -567,7 +656,9 @@ "type": "entity", "formclass": "row", "header": "default", - "title": "Sign up / Create new account", + "title": "REGISTER", + "isSignupForm":"true", + "langKey" : "teacherStudent", "fieldsets": [ { "definition": "Student", @@ -578,7 +669,7 @@ "properties": { "above13": { "enum": [ - "Yes" + "No" ] }, "guardianDetails": { @@ -586,11 +677,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" } } } @@ -616,7 +707,7 @@ "name": "above13", "custom": true, "element": { - "title": "Are you above 13?", + "title": "ARE_YOU_ABOVE_13", "enum": [ "Yes", "No" @@ -624,6 +715,7 @@ "widget": { "formlyConfig": { "type": "radio", + "defaultValue" : "Yes", "fieldGroupClassName": "controls", "className": "radio" } @@ -638,10 +730,11 @@ "fields": [ { "name": "fullName", + "description" : "AS_PER_AADHAAR_ID", "required": true, "validation": { "pattern": "^[a-zA-Z]+ [a-zA-Z]+$", - "message": "Name is not valid." + "message": "NAME_NOT_VALID" } } ] @@ -658,7 +751,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" } }, { @@ -666,11 +759,28 @@ "required": true, "validation": { "pattern": "[6-9]{1}[0-9]{9}", - "message": "Mobile Number must be 10 digit number." + "message": "MOBILE_NO_MUST_10_DIGIT" } } ] } + }, + { + "name": "t&c", + "custom": true, + "element": { + "title": "ACCEPT_TERMS_CONDITIONS", + "widget": { + "formlyConfig": { + "type": "checkbox", + "fieldGroupClassName": "controls", + "className": "checkbox", + "templateOptions": { + "required": true + } + } + } + } } ] } @@ -683,6 +793,7 @@ "api": "/Student", "type": "entity", "redirectTo": "/profile/student", + "langKey" : "teacherStudent", "fieldsets": [ { "definition": "Student", @@ -703,16 +814,20 @@ "required": true, "validation": { "pattern": "^[a-zA-Z]+ [a-zA-Z]+$", - "message": "Name is not valid." + "message": "NAME_NOT_VALID" } }, { "name": "gender" + }, { "name": "dob", "required": true, - "type": "date" + "type": "date", + "validation": { + "future":true + } }, { "name": "identityHolder", @@ -731,6 +846,7 @@ "api": "/Student", "type": "property:educationDetails", "redirectTo": "/profile/student", + "langKey" : "teacherStudent", "fieldsets": [ { "definition": "EducationType", @@ -753,12 +869,24 @@ { "name": "institute", "required": true, - "type": "autocomplete", - "api": "/Institute/search", - "key": "instituteName", - "value": "instituteName", + "autocomplete": { + "apiURL": "https://demo-education-registry.xiv.in/registry/api/v1/Institute/search", + "body": { + "filters": { + "instituteName": { + "contains": "{{value}}" + }, + "instituteAffiliation._osState": { + "eq": "PUBLISHED" + } + }, + "limit": 20, + "offset": 0 + }, + "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": { @@ -781,18 +909,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", @@ -803,7 +940,7 @@ "name": "attest", "custom": true, "element": { - "title": "Send for attestation?", + "title": "SEND_FOR_ATTENSTATION", "widget": { "formlyConfig": { "type": "checkbox", @@ -815,6 +952,25 @@ } } } + }, + { + "name": "notes", + "custom": true, + "element": { + "title": "NOTE", + "widget": { + "formlyConfig": { + "type": "string", + "fieldGroupClassName": "controls", + "className": "input", + "hideExpression": "!model.attest", + "templateOptions": { + "maxLength":250 + } + + } + } + } } ] } @@ -822,4 +978,4 @@ } } ] -} \ No newline at end of file +} diff --git a/ui-config/headers.json b/ui-config/headers.json index 8b5fa87..99a1dbc 100644 --- a/ui-config/headers.json +++ b/ui-config/headers.json @@ -2,11 +2,15 @@ "type": "opensaberLayoutSchema", "version": "0.1", "headers": [ + { + "blank":{ + } + }, { "default":{ "right":[ { - "title": "Login", + "title": "LOGIN", "redirectTo": "/login" } ] @@ -16,18 +20,19 @@ "institute": { "left": [ { - "title": "Home", + "title": "HOME", "redirectTo": "/profile/institute" }, { - "title": "Attestations", + "title": "ATTESTATIONS", "redirectTo": "/institute/attestation/institute-attestation" } ], "right": [ { - "image": "/assets/images/logout.png", - "redirectTo": "/logout" + "title": "LOGOUT", + "redirectTo": "/logout", + "className" : "font-weight-bold" } ] } @@ -36,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" } ] } @@ -56,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" } ] } @@ -72,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 62d9483..9c79b4f 100644 --- a/ui-config/layouts.json +++ b/ui-config/layouts.json @@ -5,30 +5,37 @@ { "institute": { "api": "/Institute", - "title": "Institute Profile", + "title": "INSTITUTE_PROFILE", + "langKey" : "institute", + "headerName" : "instituteName", + "subHeadername" : "address.state,contactDetails.address.city", "blocks": [ { "definition": "Institute", - "title": "Basic details", + "title": "INSTITUTE_DEATILS", "add": false, "edit": true, "editform":"institute-setup", "fields": { "includes": ["*"], "excludes": ["affiliation"] - } + }, + "propertyShowFirst" : [ "instituteName", "email"] }, { "definition": "Institute", - "title": "Affiliation details", + "title": "AFFILIATION_DETAILS", "add": true, "addform":"affiliation", - "edit": false, + "claimEdit": true, "editform":"affiliation", "multiple": true, + "headValue" : "affiliationNumber", + "canRaiseClaim" : true, "fields": { "includes": ["affiliation"] - } + }, + "propertyShowFirst" : [ "affiliationNumber", "medium", "grantYear", "expiryYear"] } ] } @@ -36,40 +43,53 @@ { "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": "Basic details", + "title": "PERSONAL_DETAILS", "add": false, "edit": true, "editform":"teacher-setup", "fields": { "includes": ["*"], "excludes": ["experience","academicQualifications"] - } + }, + "propertyShowFirst" : [ "fullName", "mobile", "email"] + }, { "definition": "Teacher", - "title": "Experience details", + "title": "PROFESSIONAL_EXPERIENCE", "add": true, "addform":"teacher-experience", - "edit": false, + "editform":"teacher-experience", + "claimEdit": true, "multiple": true, + "headValue" : "teacherType", + "canRaiseClaim" : true, "fields": { "includes": ["experience"] - } + }, + "propertyShowFirst" : [ "employmentType", "instituteName"] }, { "definition": "Teacher", - "title": "Academic Qualifications", + "title": "EDUCATION", "add": true, "addform":"teacher-education", - "edit": false, + "editform":"teacher-education", + "claimEdit": true, "multiple": true, + "canRaiseClaim" : false, + "headValue" : "qualification", "fields": { "includes": ["academicQualifications"] - } + }, + "propertyShowFirst" : [ "qualification", "instituteName", "graduationYear"] } ] } @@ -77,26 +97,34 @@ { "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", "fields": { "includes": ["*"], "excludes": ["educationDetails"] - } + }, + "propertyShowFirst" : [ "fullName", "mobile", "email"] }, { "definition": "Student", - "title": "Education details", + "title": "EDUCATION_DEATILS", "add": true, "addform":"student-education", + "editform":"student-education", "edit": false, + "claimEdit": true, + "canRaiseClaim" : true, "multiple": true, + "headValue" : "class", "fields": { "includes": ["educationDetails"] } @@ -110,4 +138,4 @@ } } ] -} \ No newline at end of file +} diff --git a/ui-config/search.json b/ui-config/search.json index 80063cf..96cbd10 100644 --- a/ui-config/search.json +++ b/ui-config/search.json @@ -7,70 +7,72 @@ { "institute": { "tab": "institute", - "tabTitle": "Search Institute", + "tabTitle": "SEARCH_INSTITUTE", "api": "/Institute/search", "activeTab": "active", + "privateFields": "InstituteOsConfig", "filters": [ { "key": "board", "type": "text", - "title": "Board", + "title": "BOARD", "propertyPath": "affiliation.board" }, { "key": "instituteName", - "type": "autocomplete", - "title": "Institute Name", + "autocomplete": { + "apiURL": "https://demo-education-registry.xiv.in/registry/api/v1/Institute/search", + "body": { + "filters": { + "instituteName": { + "startsWith": "{{value}}" + } + + }, + "limit": 20, + "offset": 0 + } + }, + + "title": "INSTITUTE_NAME", "default": true, - "defaultValue": "any", "propertyPath": "instituteName", - "api": "/Institute/search", - "placeholder" : "Enter 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", - "propertyPath": "address.pincode" } + ], "results": { "fields": [ { - "title" : "Institute Name", + "title" : "INSTITUTE_NAME", "property" : "instituteName" }, { - "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" } ] @@ -80,165 +82,55 @@ { "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", - "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" : "Teacher Name", - "property" : "identityDetails.fullName" - }, - { - - "title" : "Qualification", - "property" : "qualification" - }, - { - - "title" : "Subject", - "property" : "subject" - }, - { - - "title" : "District", - "property" : "contactDetails.address.district" - }, - { - - "title" : "State", - "property" : "contactDetails.address.state" - } - ] - } - } - }, - { - "student": { - "tab": "student", - "tabTitle": "Search Student", - "api": "/Student/search", - "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", + "title": "STATE", "propertyPath": "contactDetails.address.state" }, { "key": "district", "type": "text", - "title": "District", + "title": "DISTRICT", "propertyPath": "contactDetails.address.district" - }, - { - "key": "pincode", - "type": "text", - "title": "Pincode", - "propertyPath": "contactDetails.address.pincode" } ], - "results1": { - "fields": [ - "", - "class", - "", - "state", - "district" - ] - }, "results": { "fields": [ { - "title" : "Student Name", + "title" : "TEACHER_NAME", "property" : "identityDetails.fullName" }, { - "title" : "Class", - "property" : "class" - }, - { - - "title" : "Graduation Year", - "property" : "graduationYear" - }, - { - - "title" : "District", - "property" : "contactDetails.address.district" + "title" : "QUALIFICATION", + "property" : "academicQualifications.qualification" }, { - "title" : "State", + "title" : "STATE", "property" : "contactDetails.address.state" } ] } } } - ], - "conditions": { - "text": [ - "is", - "is not", - "any" - ], - "date": [ - "is", - ">=", - "<=", - "between", - "any" - ] - } + ] } diff --git a/ui-config/tables.json b/ui-config/tables.json index dc33f9b..afd0cb3 100644 --- a/ui-config/tables.json +++ b/ui-config/tables.json @@ -1,26 +1,27 @@ { "type": "opensaberLayoutSchema", "version": "0.1", + "limit" : "15", "tables": [ { "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" } ] @@ -29,21 +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" } ] @@ -52,25 +54,26 @@ { "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" } ] } } ] -} \ No newline at end of file +}