From 61151e41d7af9ff120abe09eaba0cfa9db05a7c3 Mon Sep 17 00:00:00 2001 From: Bharat Kashyap Date: Wed, 14 Apr 2021 18:51:54 +0530 Subject: [PATCH 01/25] Add collection-save reference config --- reference-sample-config/collection-save.json | 219 +++++++++++++++++++ 1 file changed, 219 insertions(+) create mode 100644 reference-sample-config/collection-save.json diff --git a/reference-sample-config/collection-save.json b/reference-sample-config/collection-save.json new file mode 100644 index 00000000..962a881a --- /dev/null +++ b/reference-sample-config/collection-save.json @@ -0,0 +1,219 @@ +{ + "id": "api.form.create", + "ver": "1.0", + "ets": 0, // Device specific information to be added by Adopter OPS Team + "params": { + "msgid": "string", //UUID to be added by Adopter OPS Team + "did": "string" //Device specific information to be added by Adopter OPS Team + }, + "request": { + "type": "content", + "subType": "collection", + "action": "save", + "framework": "", // to be added by the Adopter Ops Team + "rootOrgId": "", // to be added by the Adopter Ops Team + "data": { + "templateName": "defaultTemplate", + "action": "save", + "fields": [ + { + "code": "appicon", + "dataType": "url", + "description": "App Icon", + "editable": true, + "index": 1, + "inputType": "file", + "label": "App Icon", + "name": "App Icon", + "placeholder": "App Icon", + "renderingHints": {}, + "required": true, + "visible": true + }, { + "code": "name", + "dataType": "text", + "description": "Title of the content", + "editable": true, + "index": 2, + "inputType": "text", + "label": "Title", + "name": "Title", + "placeholder": "Enter Title", + "renderingHints": {}, + "required": true, + "visible": true + }, { + "code": "description", + "dataType": "text", + "description": "Brief description", + "editable": true, + "index": 3, + "inputType": "textarea", + "label": "Description", + "name": "Description", + "placeholder": "Enter description", + "renderingHints": {}, + "required": false, + "visible": true + }, { + "code": "keywords", + "dataType": "list", + "description": "Keywords for the content", + "editable": true, + "index": 4, + "inputType": "keywordsuggestion", + "label": "keywords", + "name": "Keywords", + "placeholder": "Enter Keywords", + "renderingHints": {}, + "required": false, + "visible": true + }, { + "code": "primaryCategory", + "dataType": "text", + "description": "Collection Type", + "editable": false, + "index": 5, + "inputType": "text", + "label": "Collection Type", + "name": "Collection Type", + "placeholder": "", + "readonly": true, + "required": true, + "visible": true + }, { + "code": "additionalCategories", + "dataType": "list", + "description": "Additonal Category of the Content", + "editable": true, + "index": 5, + "inputType": "multiselect", + "label": "Additional Category", + "name": "Additional Category", + "placeholder": "Select Additional Category", + "renderingHints": {}, + "range": ["Textbook", "Lesson Plan"], + "required": false, + "visible": true + }, { + "code": "board", + "dataType": "text", + "description": "Board", + "editable": true, + "index": 6, + "inputType": "select", + "label": "Board", + "name": "Board", + "placeholder": "Select Board", + "renderingHints": {}, + "required": true, + "visible": true + }, { + "code": "medium", + "dataType": "list", + "description": "", + "editable": true, + "index": 7, + "inputType": "select", + "label": "Medium of Instruction", + "name": "medium", + "placeholder": "Select Medium", + "renderingHints": {}, + "required": true, + "visible": true + }, { + "code": "gradeLevel", + "dataType": "list", + "description": "Class", + "editable": true, + "index": 8, + "inputType": "multiselect", + "label": "Question Paper classes", + "name": "Class", + "placeholder": "Select Class", + "renderingHints": {}, + "required": true, + "visible": true + }, { + "code": "subject", + "dataType": "list", + "description": "", + "editable": true, + "index": 9, + "inputType": "select", + "label": "Question Paper subjects", + "name": "Subject", + "placeholder": "Select Subject", + "renderingHints": {}, + "required": true, + "visible": true + }, { + "code": "topic", + "dataType": "list", + "description": "Choose a Topics", + "editable": true, + "index": 10, + "inputType": "topicselector", + "label": "Topics Covered", + "name": "Topic", + "placeholder": "Choose Topics", + "renderingHints": {}, + "required": false, + "visible": true + }, { + "code": "audience", + "dataType": "list", + "description": "", + "editable": true, + "index": 11, + "inputType": "select", + "label": "Audience Type", + "name": "Audience", + "placeholder": "Select Audience", + "renderingHints": {}, + "range": ["Instructor", "Learner"], + "required": false, + "visible": true + }, { + "code": "author", + "visible": true, + "editable": true, + "dataType": "text", + "renderingHints": {}, + "name": "Author", + "description": "Original Author", + "index": 12, + "inputType": "text", + "label": "Original Author", + "placeholder": "Author", + "required": false + }, { + "code": "attributions", + "visible": true, + "editable": true, + "dataType": "list", + "renderingHints": {}, + "name": "attribution", + "description": "Attributions", + "index": 13, + "inputType": "text", + "label": "Attributions", + "placeholder": "Attributions", + "required": false + }, { + "code": "copyright", + "visible": true, + "editable": true, + "dataType": "text", + "renderingHints": {}, + "name": "Copyright", + "description": "Copyright", + "index": 14, + "inputType": "text", + "label": "Copyright", + "placeholder": "Copyright", + "required": false + }] + } + } +} From 922885b835bb7793770d49feda091fa35e2b2f8a Mon Sep 17 00:00:00 2001 From: Bharat Kashyap Date: Thu, 15 Apr 2021 15:42:06 +0530 Subject: [PATCH 02/25] Update reference-sample-config/collection-save.json Co-authored-by: Surendrasingh Sucharia --- reference-sample-config/collection-save.json | 8 -------- 1 file changed, 8 deletions(-) diff --git a/reference-sample-config/collection-save.json b/reference-sample-config/collection-save.json index 962a881a..30be6dec 100644 --- a/reference-sample-config/collection-save.json +++ b/reference-sample-config/collection-save.json @@ -1,11 +1,3 @@ -{ - "id": "api.form.create", - "ver": "1.0", - "ets": 0, // Device specific information to be added by Adopter OPS Team - "params": { - "msgid": "string", //UUID to be added by Adopter OPS Team - "did": "string" //Device specific information to be added by Adopter OPS Team - }, "request": { "type": "content", "subType": "collection", From 50a14f2f9eaab9c8ec0423b7008ef77861604e52 Mon Sep 17 00:00:00 2001 From: Bharat Kashyap Date: Thu, 15 Apr 2021 15:42:14 +0530 Subject: [PATCH 03/25] Update reference-sample-config/collection-save.json Co-authored-by: Surendrasingh Sucharia --- reference-sample-config/collection-save.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/reference-sample-config/collection-save.json b/reference-sample-config/collection-save.json index 30be6dec..0b33fcc2 100644 --- a/reference-sample-config/collection-save.json +++ b/reference-sample-config/collection-save.json @@ -11,7 +11,7 @@ { "code": "appicon", "dataType": "url", - "description": "App Icon", + "description": "Icon", "editable": true, "index": 1, "inputType": "file", From 3a85b20eb82b7156353e9037aa187b64d17dc518 Mon Sep 17 00:00:00 2001 From: Bharat Kashyap Date: Thu, 15 Apr 2021 15:42:25 +0530 Subject: [PATCH 04/25] Update reference-sample-config/collection-save.json Co-authored-by: Surendrasingh Sucharia --- reference-sample-config/collection-save.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/reference-sample-config/collection-save.json b/reference-sample-config/collection-save.json index 0b33fcc2..fa589f30 100644 --- a/reference-sample-config/collection-save.json +++ b/reference-sample-config/collection-save.json @@ -24,7 +24,7 @@ }, { "code": "name", "dataType": "text", - "description": "Title of the content", + "description": "Name of the collection", "editable": true, "index": 2, "inputType": "text", From 42b165603aee947263c0b2d9351a324435c63112 Mon Sep 17 00:00:00 2001 From: Bharat Kashyap Date: Thu, 15 Apr 2021 15:42:32 +0530 Subject: [PATCH 05/25] Update reference-sample-config/collection-save.json Co-authored-by: Surendrasingh Sucharia --- reference-sample-config/collection-save.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/reference-sample-config/collection-save.json b/reference-sample-config/collection-save.json index fa589f30..4589862c 100644 --- a/reference-sample-config/collection-save.json +++ b/reference-sample-config/collection-save.json @@ -50,7 +50,7 @@ }, { "code": "keywords", "dataType": "list", - "description": "Keywords for the content", + "description": "Keywords for the collection", "editable": true, "index": 4, "inputType": "keywordsuggestion", From 59a88da0889a18e70064da7b114ed347daa72657 Mon Sep 17 00:00:00 2001 From: Bharat Kashyap Date: Thu, 15 Apr 2021 15:42:42 +0530 Subject: [PATCH 06/25] Update reference-sample-config/collection-save.json Co-authored-by: Surendrasingh Sucharia --- reference-sample-config/collection-save.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/reference-sample-config/collection-save.json b/reference-sample-config/collection-save.json index 4589862c..aca7917a 100644 --- a/reference-sample-config/collection-save.json +++ b/reference-sample-config/collection-save.json @@ -120,7 +120,7 @@ "editable": true, "index": 8, "inputType": "multiselect", - "label": "Question Paper classes", + "label": "Class", "name": "Class", "placeholder": "Select Class", "renderingHints": {}, From d10e699d8e384e91ab377260e65c728546005cce Mon Sep 17 00:00:00 2001 From: Bharat Kashyap Date: Thu, 15 Apr 2021 15:42:48 +0530 Subject: [PATCH 07/25] Update reference-sample-config/collection-save.json Co-authored-by: Surendrasingh Sucharia --- reference-sample-config/collection-save.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/reference-sample-config/collection-save.json b/reference-sample-config/collection-save.json index aca7917a..ae8b390d 100644 --- a/reference-sample-config/collection-save.json +++ b/reference-sample-config/collection-save.json @@ -142,7 +142,7 @@ }, { "code": "topic", "dataType": "list", - "description": "Choose a Topics", + "description": "Choose Topics", "editable": true, "index": 10, "inputType": "topicselector", From ba8a7c6477431d938a6d4fbd922961b4e3f717e6 Mon Sep 17 00:00:00 2001 From: Bharat Kashyap Date: Thu, 15 Apr 2021 15:42:54 +0530 Subject: [PATCH 08/25] Update reference-sample-config/collection-save.json Co-authored-by: Surendrasingh Sucharia --- reference-sample-config/collection-save.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/reference-sample-config/collection-save.json b/reference-sample-config/collection-save.json index ae8b390d..c25bfd0c 100644 --- a/reference-sample-config/collection-save.json +++ b/reference-sample-config/collection-save.json @@ -133,7 +133,7 @@ "editable": true, "index": 9, "inputType": "select", - "label": "Question Paper subjects", + "label": "Subject", "name": "Subject", "placeholder": "Select Subject", "renderingHints": {}, From 6087209d25d03fac59e227384806003430637fab Mon Sep 17 00:00:00 2001 From: Bharat Kashyap Date: Thu, 15 Apr 2021 15:43:22 +0530 Subject: [PATCH 09/25] Update reference-sample-config/collection-save.json Co-authored-by: Surendrasingh Sucharia --- reference-sample-config/collection-save.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/reference-sample-config/collection-save.json b/reference-sample-config/collection-save.json index c25bfd0c..79d1c5c4 100644 --- a/reference-sample-config/collection-save.json +++ b/reference-sample-config/collection-save.json @@ -76,7 +76,7 @@ }, { "code": "additionalCategories", "dataType": "list", - "description": "Additonal Category of the Content", + "description": "Additonal Category of the Collection", "editable": true, "index": 5, "inputType": "multiselect", From ace6e022db983ff266e5e601ab34dbb6be213b83 Mon Sep 17 00:00:00 2001 From: Bharat Kashyap Date: Thu, 15 Apr 2021 15:43:28 +0530 Subject: [PATCH 10/25] Update reference-sample-config/collection-save.json Co-authored-by: Surendrasingh Sucharia --- reference-sample-config/collection-save.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/reference-sample-config/collection-save.json b/reference-sample-config/collection-save.json index 79d1c5c4..05af0f5b 100644 --- a/reference-sample-config/collection-save.json +++ b/reference-sample-config/collection-save.json @@ -28,9 +28,9 @@ "editable": true, "index": 2, "inputType": "text", - "label": "Title", - "name": "Title", - "placeholder": "Enter Title", + "label": "Name", + "name": "Name", + "placeholder": "Enter Name", "renderingHints": {}, "required": true, "visible": true From fff5a7b58fe84221b34538d17637f42d9796fa2d Mon Sep 17 00:00:00 2001 From: Bharat Kashyap Date: Thu, 15 Apr 2021 15:43:36 +0530 Subject: [PATCH 11/25] Update reference-sample-config/collection-save.json Co-authored-by: Surendrasingh Sucharia --- reference-sample-config/collection-save.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/reference-sample-config/collection-save.json b/reference-sample-config/collection-save.json index 05af0f5b..b6e1a7de 100644 --- a/reference-sample-config/collection-save.json +++ b/reference-sample-config/collection-save.json @@ -15,9 +15,9 @@ "editable": true, "index": 1, "inputType": "file", - "label": "App Icon", - "name": "App Icon", - "placeholder": "App Icon", + "label": "Icon", + "name": "Icon", + "placeholder": "Icon", "renderingHints": {}, "required": true, "visible": true From cbb9f546d22da5ef59066f0d887916628f076469 Mon Sep 17 00:00:00 2001 From: Bharat Kashyap Date: Thu, 15 Apr 2021 16:24:08 +0530 Subject: [PATCH 12/25] Add copyrightYear, license and licenseTerms --- reference-sample-config/collection-save.json | 58 +++++++++++++++++++- 1 file changed, 57 insertions(+), 1 deletion(-) diff --git a/reference-sample-config/collection-save.json b/reference-sample-config/collection-save.json index b6e1a7de..8eb25ff0 100644 --- a/reference-sample-config/collection-save.json +++ b/reference-sample-config/collection-save.json @@ -205,7 +205,63 @@ "label": "Copyright", "placeholder": "Copyright", "required": false - }] + }, + , { + "code": "copyrightYear", + "visible": true, + "editable": true, + "dataType": "list", + "renderingHints": {}, + "description": "Year of Creation", + "index": 10, + "label": "Year of Creation", + "required": true, + "name": "Year of Creation", + "inputType": "number", + "placeholder": "Enter Year of Creation", + "validation": [{ + "type": "min", + "message": "Maximum length of the year should be 4", + "value": "4" + }, { + "type": "max", + "message": "Minimum length of the year should be 4", + "value": "4" + }] + }, { + "code": "license", + "visible": true, + "editable": true, + "dataType": "text", + "renderingHints": {}, + "name": "license", + "description": "License of the content", + "index": 11, + "inputType": "licenses", + "label": "license", + "placeholder": "license", + "required": true + }, { + "code": "licenseterms", + "visible": true, + "editable": true, + "defaultValue": "By creating any type of content (resources, books, courses etc.) on DIKSHA, you consent to publish it under the Creative Commons License Framework. Please choose the applicable creative commons license you wish to apply to your content.", + "dataType": "text", + "renderingHints": { + "value": { + "video/x-youtube": "By linking or uploading YouTube videos on DIKSHA, you consent to publishing it as per the terms of the YouTube video license. DIKSHA accepts only videos with YouTube Standard License or Creative Commons License." + }, + "class": "twelve wide field" + }, + "description": "licenseterms", + "index": 12, + "label": "License Terms", + "required": false, + "name": "licenseterms", + "inputType": "label", + "placeholder": "license" + } +] } } } From 431eab326583939f7ab4ac49a013c04d197263e4 Mon Sep 17 00:00:00 2001 From: Bharat Kashyap Date: Thu, 15 Apr 2021 16:31:12 +0530 Subject: [PATCH 13/25] Update collection-save.json --- reference-sample-config/collection-save.json | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/reference-sample-config/collection-save.json b/reference-sample-config/collection-save.json index 8eb25ff0..1a740ad2 100644 --- a/reference-sample-config/collection-save.json +++ b/reference-sample-config/collection-save.json @@ -2,8 +2,8 @@ "type": "content", "subType": "collection", "action": "save", - "framework": "", // to be added by the Adopter Ops Team - "rootOrgId": "", // to be added by the Adopter Ops Team + "framework": "", + "rootOrgId": "", "data": { "templateName": "defaultTemplate", "action": "save", @@ -205,15 +205,14 @@ "label": "Copyright", "placeholder": "Copyright", "required": false - }, - , { + }, { "code": "copyrightYear", "visible": true, "editable": true, "dataType": "list", "renderingHints": {}, "description": "Year of Creation", - "index": 10, + "index": 15, "label": "Year of Creation", "required": true, "name": "Year of Creation", @@ -236,7 +235,7 @@ "renderingHints": {}, "name": "license", "description": "License of the content", - "index": 11, + "index": 16, "inputType": "licenses", "label": "license", "placeholder": "license", @@ -254,14 +253,13 @@ "class": "twelve wide field" }, "description": "licenseterms", - "index": 12, + "index": 17, "label": "License Terms", "required": false, "name": "licenseterms", "inputType": "label", "placeholder": "license" } -] + ] } } -} From 5bf9aab0f69d6be5cfb293440cc98a183f637032 Mon Sep 17 00:00:00 2001 From: Bharat Kashyap Date: Thu, 15 Apr 2021 18:37:52 +0530 Subject: [PATCH 14/25] Rebase from production configuration --- reference-sample-config/collection-save.json | 541 ++++++++++--------- 1 file changed, 278 insertions(+), 263 deletions(-) diff --git a/reference-sample-config/collection-save.json b/reference-sample-config/collection-save.json index 1a740ad2..9f3797fc 100644 --- a/reference-sample-config/collection-save.json +++ b/reference-sample-config/collection-save.json @@ -1,265 +1,280 @@ - "request": { - "type": "content", - "subType": "collection", - "action": "save", - "framework": "", - "rootOrgId": "", - "data": { - "templateName": "defaultTemplate", - "action": "save", - "fields": [ - { - "code": "appicon", - "dataType": "url", - "description": "Icon", - "editable": true, - "index": 1, - "inputType": "file", - "label": "Icon", - "name": "Icon", - "placeholder": "Icon", - "renderingHints": {}, - "required": true, - "visible": true +"request": { + "type": "content", + "subtype": "collection", + "action": "save", + "component": "", + "framework": "", + "data": { + "templateName": "defaultTemplate", + "action": "save", + "fields": [{ + "code": "appicon", + "visible": true, + "editable": true, + "dataType": "url", + "renderingHints": {}, + "name": "App Icon", + "description": "App Icon", + "index": 0, + "inputType": "file", + "label": "Icon", + "placeholder": "App Icon", + "required": false + }, { + "code": "name", + "visible": true, + "editable": true, + "displayProperty": "Editable", + "dataType": "text", + "renderingHints": { + "width": "twelve" + }, + "description": "Name", + "index": 1, + "label": "Name", + "required": true, + "name": "Name", + "inputType": "text", + "placeholder": "Name", + "validation": [{ + "type": "max", + "message": "Input is Exceded", + "value": "120" + }] + }, { + "code": "description", + "visible": true, + "editable": true, + "displayProperty": "Editable", + "dataType": "textarea", + "renderingHints": { + "width": "twelve" + }, + "description": "description", + "index": 2, + "label": "Description", + "required": false, + "name": "Description", + "inputType": "textarea", + "placeholder": "Description", + "validation": [{ + "type": "max", + "message": "Input is Exceded", + "value": "1000" + }] + }, { + "code": "keywords", + "visible": true, + "editable": true, + "dataType": "list", + "name": "Keywords", + "index": 3, + "description": "Keywords for the content", + "inputType": "keywordsuggestion", + "label": "keywords", + "placeholder": "Enter Keywords", + "required": false + }, { + "code": "primaryCategory", + "dataType": "text", + "description": "Collection Type", + "editable": false, + "index": 4, + "renderingHints": {}, + "inputType": "text", + "label": "Collection Type", + "name": "Collection Type", + "placeholder": "", + "required": true, + "visible": true + }, { + "code": "additionalCategories", + "dataType": "list", + "description": "Additonal Category of the Content", + "editable": true, + "index": 5, + "inputType": "multiselect", + "label": "Additional Category", + "name": "Additional Category", + "placeholder": "Select Additional Category", + "renderingHints": {}, + "range": ["Textbook", "Lesson Plan"], + "required": false, + "visible": true + }, + { + "code": "board", + "dataType": "text", + "description": "Board", + "editable": true, + "index": 6, + "inputType": "select", + "label": "Board", + "name": "Board", + "placeholder": "Select Board", + "renderingHints": {}, + "required": true, + "visible": true + }, { + "code": "medium", + "dataType": "list", + "description": "", + "editable": true, + "index": 7, + "inputType": "select", + "label": "Medium of Instruction", + "name": "medium", + "placeholder": "Select Medium", + "renderingHints": {}, + "required": true, + "visible": true + }, { + "code": "gradeLevel", + "dataType": "list", + "description": "Class", + "editable": true, + "index": 8, + "inputType": "multiselect", + "label": "Class", + "name": "Class", + "placeholder": "Select Class", + "renderingHints": {}, + "required": true, + "visible": true + }, { + "code": "subject", + "dataType": "list", + "description": "", + "editable": true, + "index": 9, + "inputType": "select", + "label": "Subject", + "name": "Subject", + "placeholder": "Select Subject", + "renderingHints": {}, + "required": true, + "visible": true + }, { + "code": "topic", + "dataType": "list", + "description": "Choose Topics", + "editable": true, + "index": 10, + "inputType": "topicselector", + "label": "Topics Covered", + "name": "Topic", + "placeholder": "Choose Topics", + "renderingHints": {}, + "required": false, + "visible": true + }, { + "code": "audience", + "visible": true, + "editable": false, + "dataType": "list", + "renderingHints": {}, + "description": "", + "index": 11, + "range": ["Administrator", "Parent", "Student", "Teacher"], + "label": "Audience", + "required": false, + "name": "Audience", + "inputType": "multiselect", + "placeholder": "Select Audience" + }, { + "code": "author", + "visible": true, + "editable": true, + "dataType": "text", + "renderingHints": {}, + "name": "Author", + "description": "Original Author", + "index": 12, + "inputType": "text", + "label": "Original Author", + "placeholder": "Author", + "required": false + }, { + "code": "attributions", + "visible": true, + "editable": true, + "dataType": "list", + "renderingHints": {}, + "name": "attribution", + "description": "Attributions", + "index": 13, + "inputType": "text", + "label": "Attributions", + "placeholder": "Attributions", + "required": false + }, { + "code": "copyright", + "visible": true, + "editable": true, + "dataType": "text", + "renderingHints": {}, + "name": "Copyright", + "description": "Copyright", + "index": 14, + "inputType": "text", + "label": "Copyright", + "placeholder": "Copyright", + "required": false + }, { + "code": "copyrightYear", + "visible": true, + "editable": true, + "dataType": "list", + "renderingHints": {}, + "description": "Year of Creation", + "index": 15, + "label": "Year of Creation", + "required": true, + "name": "Year of Creation", + "inputType": "number", + "placeholder": "Enter Year of Creation", + "validation": [{ + "type": "min", + "message": "Maximum length of the year should be 4", + "value": "4" }, { - "code": "name", - "dataType": "text", - "description": "Name of the collection", - "editable": true, - "index": 2, - "inputType": "text", - "label": "Name", - "name": "Name", - "placeholder": "Enter Name", - "renderingHints": {}, - "required": true, - "visible": true - }, { - "code": "description", - "dataType": "text", - "description": "Brief description", - "editable": true, - "index": 3, - "inputType": "textarea", - "label": "Description", - "name": "Description", - "placeholder": "Enter description", - "renderingHints": {}, - "required": false, - "visible": true - }, { - "code": "keywords", - "dataType": "list", - "description": "Keywords for the collection", - "editable": true, - "index": 4, - "inputType": "keywordsuggestion", - "label": "keywords", - "name": "Keywords", - "placeholder": "Enter Keywords", - "renderingHints": {}, - "required": false, - "visible": true - }, { - "code": "primaryCategory", - "dataType": "text", - "description": "Collection Type", - "editable": false, - "index": 5, - "inputType": "text", - "label": "Collection Type", - "name": "Collection Type", - "placeholder": "", - "readonly": true, - "required": true, - "visible": true - }, { - "code": "additionalCategories", - "dataType": "list", - "description": "Additonal Category of the Collection", - "editable": true, - "index": 5, - "inputType": "multiselect", - "label": "Additional Category", - "name": "Additional Category", - "placeholder": "Select Additional Category", - "renderingHints": {}, - "range": ["Textbook", "Lesson Plan"], - "required": false, - "visible": true - }, { - "code": "board", - "dataType": "text", - "description": "Board", - "editable": true, - "index": 6, - "inputType": "select", - "label": "Board", - "name": "Board", - "placeholder": "Select Board", - "renderingHints": {}, - "required": true, - "visible": true - }, { - "code": "medium", - "dataType": "list", - "description": "", - "editable": true, - "index": 7, - "inputType": "select", - "label": "Medium of Instruction", - "name": "medium", - "placeholder": "Select Medium", - "renderingHints": {}, - "required": true, - "visible": true - }, { - "code": "gradeLevel", - "dataType": "list", - "description": "Class", - "editable": true, - "index": 8, - "inputType": "multiselect", - "label": "Class", - "name": "Class", - "placeholder": "Select Class", - "renderingHints": {}, - "required": true, - "visible": true - }, { - "code": "subject", - "dataType": "list", - "description": "", - "editable": true, - "index": 9, - "inputType": "select", - "label": "Subject", - "name": "Subject", - "placeholder": "Select Subject", - "renderingHints": {}, - "required": true, - "visible": true - }, { - "code": "topic", - "dataType": "list", - "description": "Choose Topics", - "editable": true, - "index": 10, - "inputType": "topicselector", - "label": "Topics Covered", - "name": "Topic", - "placeholder": "Choose Topics", - "renderingHints": {}, - "required": false, - "visible": true - }, { - "code": "audience", - "dataType": "list", - "description": "", - "editable": true, - "index": 11, - "inputType": "select", - "label": "Audience Type", - "name": "Audience", - "placeholder": "Select Audience", - "renderingHints": {}, - "range": ["Instructor", "Learner"], - "required": false, - "visible": true - }, { - "code": "author", - "visible": true, - "editable": true, - "dataType": "text", - "renderingHints": {}, - "name": "Author", - "description": "Original Author", - "index": 12, - "inputType": "text", - "label": "Original Author", - "placeholder": "Author", - "required": false - }, { - "code": "attributions", - "visible": true, - "editable": true, - "dataType": "list", - "renderingHints": {}, - "name": "attribution", - "description": "Attributions", - "index": 13, - "inputType": "text", - "label": "Attributions", - "placeholder": "Attributions", - "required": false - }, { - "code": "copyright", - "visible": true, - "editable": true, - "dataType": "text", - "renderingHints": {}, - "name": "Copyright", - "description": "Copyright", - "index": 14, - "inputType": "text", - "label": "Copyright", - "placeholder": "Copyright", - "required": false - }, { - "code": "copyrightYear", - "visible": true, - "editable": true, - "dataType": "list", - "renderingHints": {}, - "description": "Year of Creation", - "index": 15, - "label": "Year of Creation", - "required": true, - "name": "Year of Creation", - "inputType": "number", - "placeholder": "Enter Year of Creation", - "validation": [{ - "type": "min", - "message": "Maximum length of the year should be 4", - "value": "4" - }, { - "type": "max", - "message": "Minimum length of the year should be 4", - "value": "4" - }] - }, { - "code": "license", - "visible": true, - "editable": true, - "dataType": "text", - "renderingHints": {}, - "name": "license", - "description": "License of the content", - "index": 16, - "inputType": "licenses", - "label": "license", - "placeholder": "license", - "required": true - }, { - "code": "licenseterms", - "visible": true, - "editable": true, - "defaultValue": "By creating any type of content (resources, books, courses etc.) on DIKSHA, you consent to publish it under the Creative Commons License Framework. Please choose the applicable creative commons license you wish to apply to your content.", - "dataType": "text", - "renderingHints": { - "value": { - "video/x-youtube": "By linking or uploading YouTube videos on DIKSHA, you consent to publishing it as per the terms of the YouTube video license. DIKSHA accepts only videos with YouTube Standard License or Creative Commons License." - }, - "class": "twelve wide field" + "type": "max", + "message": "Minimum length of the year should be 4", + "value": "4" + }] + }, { + "code": "license", + "visible": true, + "editable": true, + "dataType": "text", + "renderingHints": {}, + "name": "license", + "description": "License of the content", + "index": 16, + "inputType": "licenses", + "label": "license", + "placeholder": "license", + "required": true + }, { + "code": "licenseterms", + "visible": true, + "editable": true, + "defaultValue": "By creating any type of content (resources, books, courses etc.) on DIKSHA, you consent to publish it under the Creative Commons License Framework. Please choose the applicable creative commons license you wish to apply to your content.", + "dataType": "text", + "renderingHints": { + "value": { + "video/x-youtube": "By linking or uploading YouTube videos on DIKSHA, you consent to publishing it as per the terms of the YouTube video license. DIKSHA accepts only videos with YouTube Standard License or Creative Commons License." }, - "description": "licenseterms", - "index": 17, - "label": "License Terms", - "required": false, - "name": "licenseterms", - "inputType": "label", - "placeholder": "license" - } - ] - } - } + "class": "twelve wide field" + }, + "description": "licenseterms", + "index": 17, + "label": "License Terms", + "required": false, + "name": "licenseterms", + "inputType": "label", + "placeholder": "license" + } + ] + } +} From 8d491c8dae63446d37d7a8968388d92f9c088a89 Mon Sep 17 00:00:00 2001 From: Bharat Kashyap Date: Thu, 15 Apr 2021 18:42:43 +0530 Subject: [PATCH 15/25] Create collection-review.json --- .../collection-review.json | 281 ++++++++++++++++++ 1 file changed, 281 insertions(+) create mode 100644 reference-sample-config/collection-review.json diff --git a/reference-sample-config/collection-review.json b/reference-sample-config/collection-review.json new file mode 100644 index 00000000..bbdadeff --- /dev/null +++ b/reference-sample-config/collection-review.json @@ -0,0 +1,281 @@ + "request" : +{ + "type": "content", + "subtype": "collection", + "action": "review", + "component": "", + "framework": "", + "data": { + "templateName": "defaultTemplate", + "action": "review", + "fields": [{ + "code": "appicon", + "visible": true, + "editable": true, + "dataType": "url", + "renderingHints": {}, + "name": "App Icon", + "description": "App Icon", + "index": 0, + "inputType": "file", + "label": "Icon", + "placeholder": "App Icon", + "required": true + }, { + "code": "name", + "visible": true, + "editable": true, + "displayProperty": "Editable", + "dataType": "text", + "renderingHints": { + "width": "twelve" + }, + "description": "Name", + "index": 1, + "label": "Name", + "required": true, + "name": "Name", + "inputType": "text", + "placeholder": "Name", + "validation": [{ + "type": "max", + "message": "Input is Exceded", + "value": "120" + }] + }, { + "code": "description", + "visible": true, + "editable": true, + "displayProperty": "Editable", + "dataType": "textarea", + "renderingHints": { + "width": "twelve" + }, + "description": "description", + "index": 2, + "label": "Description", + "required": false, + "name": "Description", + "inputType": "textarea", + "placeholder": "Description", + "validation": [{ + "type": "max", + "message": "Input is Exceded", + "value": "1000" + }] + }, { + "code": "keywords", + "visible": true, + "editable": true, + "dataType": "list", + "name": "Keywords", + "description": "Keywords for the content", + "inputType": "keywordsuggestion", + "label": "keywords", + "index": 3, + "placeholder": "Enter Keywords", + "required": false + }, { + "code": "primaryCategory", + "dataType": "text", + "description": "Collection Type", + "editable": false, + "index": 4, + "renderingHints": {}, + "inputType": "text", + "label": "Collection Type", + "name": "Collection Type", + "placeholder": "", + "required": true, + "visible": true + }, { + "code": "additionalCategories", + "dataType": "list", + "description": "Additonal Category of the Content", + "editable": true, + "index": 5, + "inputType": "multiselect", + "label": "Additional Category", + "name": "Additional Category", + "placeholder": "Select Additional Category", + "renderingHints": {}, + "range": ["Textbook", "Lesson Plan"], + "required": false, + "visible": true + }, + { + "code": "board", + "dataType": "text", + "description": "Board", + "editable": true, + "index": 6, + "inputType": "select", + "label": "Board", + "name": "Board", + "placeholder": "Select Board", + "renderingHints": {}, + "required": true, + "visible": true + }, { + "code": "medium", + "dataType": "list", + "description": "", + "editable": true, + "index": 7, + "inputType": "select", + "label": "Medium of Instruction", + "name": "medium", + "placeholder": "Select Medium", + "renderingHints": {}, + "required": true, + "visible": true + }, { + "code": "gradeLevel", + "dataType": "list", + "description": "Class", + "editable": true, + "index": 8, + "inputType": "multiselect", + "label": "Class", + "name": "Class", + "placeholder": "Select Class", + "renderingHints": {}, + "required": true, + "visible": true + }, { + "code": "subject", + "dataType": "list", + "description": "", + "editable": true, + "index": 9, + "inputType": "select", + "label": "Subject", + "name": "Subject", + "placeholder": "Select Subject", + "renderingHints": {}, + "required": true, + "visible": true + }, { + "code": "topic", + "dataType": "list", + "description": "Choose Topics", + "editable": true, + "index": 10, + "inputType": "topicselector", + "label": "Topics Covered", + "name": "Topic", + "placeholder": "Choose Topics", + "renderingHints": {}, + "required": false, + "visible": true + }, { + "code": "audience", + "visible": true, + "editable": false, + "dataType": "list", + "renderingHints": {}, + "description": "", + "index": 6, + "range": ["Administrator", "Parent", "Student", "Teacher"], + "label": "Audience", + "required": false, + "name": "Audience", + "inputType": "multiselect", + "placeholder": "Select Audience" + }, { + "code": "author", + "visible": true, + "editable": true, + "dataType": "text", + "renderingHints": {}, + "name": "Author", + "description": "Original Author", + "index": 7, + "inputType": "text", + "label": "Original Author", + "placeholder": "Author", + "required": false + }, { + "code": "attributions", + "visible": true, + "editable": true, + "dataType": "list", + "renderingHints": {}, + "name": "attribution", + "description": "Attributions", + "index": 8, + "inputType": "text", + "label": "Attributions", + "placeholder": "Attributions", + "required": false + }, { + "code": "copyright", + "visible": true, + "editable": true, + "dataType": "text", + "renderingHints": {}, + "name": "Copyright", + "description": "Copyright", + "index": 9, + "inputType": "text", + "label": "Copyright", + "placeholder": "Copyright", + "required": false + }, { + "code": "copyrightYear", + "visible": true, + "editable": true, + "dataType": "list", + "renderingHints": {}, + "description": "Year of Creation", + "index": 10, + "label": "Year of Creation", + "required": true, + "name": "Year of Creation", + "inputType": "number", + "placeholder": "Enter Year of Creation", + "validation": [{ + "type": "min", + "message": "Maximum length of the year should be 4", + "value": "4" + }, { + "type": "max", + "message": "Minimum length of the year should be 4", + "value": "4" + }] + }, { + "code": "license", + "visible": true, + "editable": true, + "dataType": "text", + "renderingHints": {}, + "name": "license", + "description": "License of the content", + "index": 11, + "inputType": "licenses", + "label": "license", + "placeholder": "license", + "required": true + }, { + "code": "licenseterms", + "visible": true, + "editable": true, + "defaultValue": "By creating any type of content (resources, books, courses etc.) on DIKSHA, you consent to publish it under the Creative Commons License Framework. Please choose the applicable creative commons license you wish to apply to your content.", + "dataType": "text", + "renderingHints": { + "value": { + "video/x-youtube": "By linking or uploading YouTube videos on DIKSHA, you consent to publishing it as per the terms of the YouTube video license. DIKSHA accepts only videos with YouTube Standard License or Creative Commons License." + }, + "class": "twelve wide field" + }, + "description": "licenseterms", + "index": 12, + "label": "License Terms", + "required": false, + "name": "licenseterms", + "inputType": "label", + "placeholder": "license" + } + ] + } + } From 42f723490eb8ac3c8f9a816e83bacd1580a9daa9 Mon Sep 17 00:00:00 2001 From: Bharat Kashyap Date: Fri, 16 Apr 2021 13:00:19 +0530 Subject: [PATCH 16/25] Update indices --- reference-sample-config/collection-review.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/reference-sample-config/collection-review.json b/reference-sample-config/collection-review.json index bbdadeff..985e22af 100644 --- a/reference-sample-config/collection-review.json +++ b/reference-sample-config/collection-review.json @@ -175,7 +175,7 @@ "dataType": "list", "renderingHints": {}, "description": "", - "index": 6, + "index": 11, "range": ["Administrator", "Parent", "Student", "Teacher"], "label": "Audience", "required": false, @@ -190,7 +190,7 @@ "renderingHints": {}, "name": "Author", "description": "Original Author", - "index": 7, + "index": 12, "inputType": "text", "label": "Original Author", "placeholder": "Author", @@ -203,7 +203,7 @@ "renderingHints": {}, "name": "attribution", "description": "Attributions", - "index": 8, + "index": 13, "inputType": "text", "label": "Attributions", "placeholder": "Attributions", @@ -216,7 +216,7 @@ "renderingHints": {}, "name": "Copyright", "description": "Copyright", - "index": 9, + "index": 14, "inputType": "text", "label": "Copyright", "placeholder": "Copyright", @@ -228,7 +228,7 @@ "dataType": "list", "renderingHints": {}, "description": "Year of Creation", - "index": 10, + "index": 15, "label": "Year of Creation", "required": true, "name": "Year of Creation", @@ -251,7 +251,7 @@ "renderingHints": {}, "name": "license", "description": "License of the content", - "index": 11, + "index": 16, "inputType": "licenses", "label": "license", "placeholder": "license", @@ -269,7 +269,7 @@ "class": "twelve wide field" }, "description": "licenseterms", - "index": 12, + "index": 17, "label": "License Terms", "required": false, "name": "licenseterms", From 74c8246ef3eedce17f0e272cf57ba4f2a6b7dad0 Mon Sep 17 00:00:00 2001 From: Bharat Kashyap Date: Fri, 16 Apr 2021 13:02:30 +0530 Subject: [PATCH 17/25] Apply suggestions from code review Co-authored-by: Surendrasingh Sucharia --- reference-sample-config/collection-review.json | 1 + reference-sample-config/collection-save.json | 1 + 2 files changed, 2 insertions(+) diff --git a/reference-sample-config/collection-review.json b/reference-sample-config/collection-review.json index 985e22af..a8e46e83 100644 --- a/reference-sample-config/collection-review.json +++ b/reference-sample-config/collection-review.json @@ -5,6 +5,7 @@ "action": "review", "component": "", "framework": "", + "rootOrgId":"", "data": { "templateName": "defaultTemplate", "action": "review", diff --git a/reference-sample-config/collection-save.json b/reference-sample-config/collection-save.json index 9f3797fc..6ba83429 100644 --- a/reference-sample-config/collection-save.json +++ b/reference-sample-config/collection-save.json @@ -4,6 +4,7 @@ "action": "save", "component": "", "framework": "", + "rootOrgId":"", "data": { "templateName": "defaultTemplate", "action": "save", From 6a4e8dd1c4fd76c5e4294bda376d9d4f9fb38975 Mon Sep 17 00:00:00 2001 From: Bharat Kashyap Date: Fri, 16 Apr 2021 16:26:08 +0530 Subject: [PATCH 18/25] JSON lint --- reference-sample-config/collection-review.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/reference-sample-config/collection-review.json b/reference-sample-config/collection-review.json index a8e46e83..0459acbd 100644 --- a/reference-sample-config/collection-review.json +++ b/reference-sample-config/collection-review.json @@ -1,4 +1,4 @@ - "request" : +{ "request" : { "type": "content", "subtype": "collection", @@ -280,3 +280,4 @@ ] } } +} From 7e082c28277b2f8f0f367b8d006159fb6c8a7231 Mon Sep 17 00:00:00 2001 From: Bharat Kashyap Date: Fri, 16 Apr 2021 16:26:36 +0530 Subject: [PATCH 19/25] JSON lint --- reference-sample-config/collection-save.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/reference-sample-config/collection-save.json b/reference-sample-config/collection-save.json index 6ba83429..6e59f22c 100644 --- a/reference-sample-config/collection-save.json +++ b/reference-sample-config/collection-save.json @@ -1,4 +1,5 @@ -"request": { +{ + "request": { "type": "content", "subtype": "collection", "action": "save", @@ -279,3 +280,4 @@ ] } } +} From a1b4210c63c3b85589f01c6f7f1c0febd971c37f Mon Sep 17 00:00:00 2001 From: Bharat Kashyap Date: Wed, 12 May 2021 13:34:57 +0530 Subject: [PATCH 20/25] Update collection-save: Add dependency information --- reference-sample-config/collection-save.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/reference-sample-config/collection-save.json b/reference-sample-config/collection-save.json index 6e59f22c..71ed09a6 100644 --- a/reference-sample-config/collection-save.json +++ b/reference-sample-config/collection-save.json @@ -107,6 +107,7 @@ { "code": "board", "dataType": "text", + "depends": ["medium", "gradeLevel", "subject", "topic"], "description": "Board", "editable": true, "index": 6, @@ -119,7 +120,8 @@ "visible": true }, { "code": "medium", - "dataType": "list", + "dataType": "list", + "depends": ["gradeLevel", "subject", "topic"], "description": "", "editable": true, "index": 7, @@ -133,6 +135,7 @@ }, { "code": "gradeLevel", "dataType": "list", + "depends": ["subject", "topic"], "description": "Class", "editable": true, "index": 8, @@ -146,6 +149,7 @@ }, { "code": "subject", "dataType": "list", + "depends": ["topic"], "description": "", "editable": true, "index": 9, From 1c16837f575c91866357d83b5919491c2fe60707 Mon Sep 17 00:00:00 2001 From: Bharat Kashyap Date: Wed, 12 May 2021 13:42:10 +0530 Subject: [PATCH 21/25] Update collection-review: Add dependency info --- reference-sample-config/collection-review.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/reference-sample-config/collection-review.json b/reference-sample-config/collection-review.json index 0459acbd..8c112e43 100644 --- a/reference-sample-config/collection-review.json +++ b/reference-sample-config/collection-review.json @@ -107,6 +107,7 @@ { "code": "board", "dataType": "text", + "depends": ["medium", "gradeLevel", "subject", "topic"], "description": "Board", "editable": true, "index": 6, @@ -120,6 +121,7 @@ }, { "code": "medium", "dataType": "list", + "depends": ["gradeLevel", "subject", "topic"], "description": "", "editable": true, "index": 7, @@ -133,6 +135,7 @@ }, { "code": "gradeLevel", "dataType": "list", + "depends": ["subject", "topic"], "description": "Class", "editable": true, "index": 8, @@ -146,6 +149,7 @@ }, { "code": "subject", "dataType": "list", + "depends": ["topic"], "description": "", "editable": true, "index": 9, From f8816b666abf758f20429834b7c54e5199824177 Mon Sep 17 00:00:00 2001 From: Bharat Kashyap Date: Wed, 12 May 2021 22:30:35 +0530 Subject: [PATCH 22/25] Rename "subtype" to "subType" --- reference-sample-config/collection-review.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/reference-sample-config/collection-review.json b/reference-sample-config/collection-review.json index 8c112e43..cb3e7226 100644 --- a/reference-sample-config/collection-review.json +++ b/reference-sample-config/collection-review.json @@ -1,7 +1,7 @@ { "request" : { "type": "content", - "subtype": "collection", + "subType": "collection", "action": "review", "component": "", "framework": "", From fc7717b0ad25f8571e80efa5c0b84d221156d51b Mon Sep 17 00:00:00 2001 From: Bharat Kashyap Date: Wed, 12 May 2021 22:31:08 +0530 Subject: [PATCH 23/25] Rename "subType" to "subtype" --- reference-sample-config/collection-save.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/reference-sample-config/collection-save.json b/reference-sample-config/collection-save.json index 71ed09a6..141f5f02 100644 --- a/reference-sample-config/collection-save.json +++ b/reference-sample-config/collection-save.json @@ -1,7 +1,7 @@ { "request": { "type": "content", - "subtype": "collection", + "subType": "collection", "action": "save", "component": "", "framework": "", From 98ba11aa23b38c73da4aa94fc8367b85aea022a5 Mon Sep 17 00:00:00 2001 From: Bharat Kashyap Date: Mon, 31 May 2021 12:36:23 +0530 Subject: [PATCH 24/25] Update collection-save.json --- reference-sample-config/collection-save.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/reference-sample-config/collection-save.json b/reference-sample-config/collection-save.json index 141f5f02..b211f0d4 100644 --- a/reference-sample-config/collection-save.json +++ b/reference-sample-config/collection-save.json @@ -153,7 +153,7 @@ "description": "", "editable": true, "index": 9, - "inputType": "select", + "inputType": "multiselect", "label": "Subject", "name": "Subject", "placeholder": "Select Subject", From 271d4b851e94bccc4416a35e4d3c07ee0bc53b73 Mon Sep 17 00:00:00 2001 From: Bharat Kashyap Date: Mon, 31 May 2021 12:36:52 +0530 Subject: [PATCH 25/25] Update collection-review.json --- reference-sample-config/collection-review.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/reference-sample-config/collection-review.json b/reference-sample-config/collection-review.json index cb3e7226..8288630d 100644 --- a/reference-sample-config/collection-review.json +++ b/reference-sample-config/collection-review.json @@ -153,7 +153,7 @@ "description": "", "editable": true, "index": 9, - "inputType": "select", + "inputType": "multiselect", "label": "Subject", "name": "Subject", "placeholder": "Select Subject",