From 2158931867efc31191f7d640cf62c30032698ee9 Mon Sep 17 00:00:00 2001 From: 1senka Date: Sat, 28 Sep 2024 17:58:55 +0330 Subject: [PATCH 1/2] add simple reference --- .../renderable/print/simple/index.html | 8 +++++-- package-lock.json | 4 ++-- server/schemas/questions/1161.json | 23 +++++++++++++++++++ .../part-control/QuestionPartFactory.ts | 9 ++++++++ .../reference/ReferenceSimpleType.ts | 11 +++++++++ 5 files changed, 51 insertions(+), 4 deletions(-) create mode 100644 src/component/renderable/schema/part-control/auto-fill/reference/ReferenceSimpleType.ts diff --git a/example/component/renderable/print/simple/index.html b/example/component/renderable/print/simple/index.html index 5ed6a2c7..98b47dfc 100644 --- a/example/component/renderable/print/simple/index.html +++ b/example/component/renderable/print/simple/index.html @@ -57,7 +57,7 @@ @@ -74,12 +74,16 @@ }, { id: 2, - name: "akaberi", + name: "akbari", }, { id: 3, name: "amir", }, + { + id : 4, + name :"ali" + } ], }, }; diff --git a/package-lock.json b/package-lock.json index 8545330c..888791fb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "basiscore", - "version": "2.34.3", + "version": "2.35.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "basiscore", - "version": "2.34.3", + "version": "2.35.0", "license": "ISC", "dependencies": { "@types/pako": "^2.0.3", diff --git a/server/schemas/questions/1161.json b/server/schemas/questions/1161.json index 927278d6..e4915e36 100644 --- a/server/schemas/questions/1161.json +++ b/server/schemas/questions/1161.json @@ -659,6 +659,29 @@ } ] }, + { + "prpId": 44444, + "typeId": 128, + "ord": 100, + "vocab": "/ولتاژ", + "title": " simple reference no multi", + "wordId": 50678, + "multi": false, + "cssClass": "css_13060", + "help": "help data", + "parts": [ + { + "part": 2, + "viewType": "simplereference", + "cssClass": "css_13060_1", + "validations": { + "required": true + }, + "caption": "", + "link": "/schema/autocomplete?term=${term}" + } + ] + }, { "prpId": 55555, "typeId": 128, diff --git a/src/component/renderable/schema/part-control/QuestionPartFactory.ts b/src/component/renderable/schema/part-control/QuestionPartFactory.ts index 63329eaa..a9cbd3a1 100644 --- a/src/component/renderable/schema/part-control/QuestionPartFactory.ts +++ b/src/component/renderable/schema/part-control/QuestionPartFactory.ts @@ -28,6 +28,7 @@ import ReadonlyColorType from "./readonly-text/ReadonlyColorType"; import ComponentContainer from "./component-container/ComponentContainer"; import HTMLFieldType from "./html/HTMLFieldType"; import AutoCompleteSimpleType from "./auto-fill/auto-complete/AutoCompleteSimpleType"; +import ReferenceSimpleType from "./auto-fill/reference/ReferenceSimpleType"; export default class QuestionPartFactory { public static generate( @@ -79,6 +80,10 @@ export default class QuestionPartFactory { retVal = new AutoCompleteSimpleType(part, owner, answer); break; } + case "simplereference": { + retVal = new ReferenceSimpleType(part, owner, answer) + break; + } case "reference": { retVal = question.multi ? new ReferenceMultiType( @@ -154,6 +159,10 @@ export default class QuestionPartFactory { retVal = new AutoCompleteSimpleType(part, owner, answer); break; } + case "simplereference": { + retVal = new ReferenceSimpleType(part, owner, answer) + break; + } case "reference": { retVal = question.multi ? new ReferenceMultiType( diff --git a/src/component/renderable/schema/part-control/auto-fill/reference/ReferenceSimpleType.ts b/src/component/renderable/schema/part-control/auto-fill/reference/ReferenceSimpleType.ts new file mode 100644 index 00000000..5adb6e8c --- /dev/null +++ b/src/component/renderable/schema/part-control/auto-fill/reference/ReferenceSimpleType.ts @@ -0,0 +1,11 @@ +import { IPartCollection } from "../../../IAnswerSchema"; +import { IQuestionPart } from "../../../IQuestionSchema"; +import Question from "../../../question/Question"; +import AutoFillSimpleType from "../AutoFillSimpleType"; + +export default class ReferenceSimpleType extends AutoFillSimpleType { + constructor(part: IQuestionPart, owner: Question, answer: IPartCollection) { + super(part, owner, answer); + } +} + From a8c34fb1a83698832982a6bfc19f694e990e004d Mon Sep 17 00:00:00 2001 From: alibazregar Date: Wed, 2 Oct 2024 10:47:37 +0330 Subject: [PATCH 2/2] add calender and datepicker to edit --- .../schema/sub-schema/edit/index.html | 6 ++- server/schemas/answers/1423332.json | 47 ++++++++++++++++++- server/schemas/questions/1163.json | 31 +++++++++++- 3 files changed, 81 insertions(+), 3 deletions(-) diff --git a/example/component/renderable/schema/sub-schema/edit/index.html b/example/component/renderable/schema/sub-schema/edit/index.html index abd55f8e..bcaa0233 100644 --- a/example/component/renderable/schema/sub-schema/edit/index.html +++ b/example/component/renderable/schema/sub-schema/edit/index.html @@ -22,7 +22,11 @@ const host = { sources: { "inline.object": [{ id: 1423332 }] - } + }, + repositories: { + "calendar.datepicker": "http://localhost:3001/basiscore.calendar.component.js", + "bc.timepicker": "http://localhost:3002/basiscore.timepicker.js" + }, } diff --git a/server/schemas/answers/1423332.json b/server/schemas/answers/1423332.json index bc3fbb99..049f4e0f 100644 --- a/server/schemas/answers/1423332.json +++ b/server/schemas/answers/1423332.json @@ -142,7 +142,52 @@ ] } ] - } + }, + { + "prpId": 6522, + "answers": [ + { + "id": 39678, + "parts": [ + { + "part": 1, + "values": [ + { + "id": 5, + "value": { + "dateid": 12634, + "mstring": "2024/10/21", + "sstring": "1403/7/30" + } + } + ] + } + ] + } + ] + }, + { + "prpId": 6523, + "answers": [ + { + "id": 39679, + "parts": [ + { + "part": 1, + "values": [ + { + "id": 4, + "value": { + "timeid": 720, + "time": "12:00" + } + } + ] + } + ] + } + ] + } ] } ] diff --git a/server/schemas/questions/1163.json b/server/schemas/questions/1163.json index 1f67e334..86b8183e 100644 --- a/server/schemas/questions/1163.json +++ b/server/schemas/questions/1163.json @@ -173,7 +173,36 @@ "link": "" } ] - } + }, { + "prpId": 6522, + "wordId": 3496, + "title": "تاریخ", + "ord": 0, + "multi": false, + "parts": [ + { + "viewType": "component.calendar.datepicker", + "part": 1, + "options": { + "dateProvider": "basisCalendar" + } + } + ] + }, + { + "prpId": 6523, + "wordId": 4233, + "title": "ساعت", + "ord": 0, + "multi": false, + "parts": [ + { + "viewType": "component.bc.timepicker", + "part": 1, + "options": {} + } + ] + } ] } ]