diff --git a/server/schema-server.js b/server/schema-server.js
index a7e88dd..65ebf8d 100644
--- a/server/schema-server.js
+++ b/server/schema-server.js
@@ -53,9 +53,14 @@ router.get("/schemas/:id", function (req, res) {
   });
 });
 router.get("/details", async function (req, res) {
-  return res.json(JSON.parse(await fs.promises.readFile(path.join(__dirname, `/schemas/new/details.json`))))
+  return res.json(JSON.parse(await fs.promises.readFile(path.join(__dirname, `/schemas/newSchema/details.json`))))
+});
+router.get("/new-schema", async function (req, res) {
+  return res.json(JSON.parse(await fs.promises.readFile(path.join(__dirname, `/schemas/newSchema/questions.json`))))
+});
+router.get("/add-to-log", async function (req, res) {
+  return res.json(JSON.parse(await fs.promises.readFile(path.join(__dirname, `/schemas/new/addToLog.json`))))
 });
-
 router.get("/fix-data/:prpId/:part", function (req, res) {
   const fixDataStr = fs.readFileSync(
     path.join(__dirname, "/schemas/data.json"),
@@ -142,8 +147,8 @@ router.get("/keys", async (req, res) => {
   }
   return res.status(200).json(data);
 });
-router.post("/temp-schema-maker", async (req, res) => {
-  const { value } = req.body;
+router.get("/temp-schema-maker", async (req, res) => {
+  const  value  = req.query.term;
   const result = { id: data.length + 1, value, status: "tempKeyWord" };
   data.push(result);
   return res.status(200).json(result);
@@ -151,8 +156,7 @@ router.post("/temp-schema-maker", async (req, res) => {
 router.get("/keywordinfo", async (req, res) => {
   const id = Number(req.query.id);
   const result = data.find((element) => element.id == id);
-  if (result) {
-    return res.status(200).json([
+    return res.status(200).json({rows : [
       {
         culture: "fa",
         title: result.value,
@@ -161,8 +165,7 @@ router.get("/keywordinfo", async (req, res) => {
         culture: "en",
         title: "Value",
       },
-    ]);
-  }
+    ],status: result.status});
 });
 
 module.exports = router;
diff --git a/server/schemas/new/questions.json b/server/schemas/new/questions.json
index 740c661..d9f600b 100644
--- a/server/schemas/new/questions.json
+++ b/server/schemas/new/questions.json
@@ -26,9 +26,8 @@
                   "parts": [
                     {
                       "part": 1,
-                      "link": "/server/popup",
-                      "viewType": "html",
-                      "multi": false
+                      "viewType": "text",
+                      "cssClass": "css_13050_1"
                     }
                   ]
                 },
@@ -58,9 +57,12 @@
                   "parts": [
                     {
                       "part": 1,
-                      "link": "/server/popup",
-                      "viewType": "html",
-                      "multi": false
+                      "viewType": "text",
+                      "validations": {
+                        "required": true,
+                        "minLength": 3,
+                        "maxLength": 50
+                      }
                     }
                   ]
                 },
@@ -93,7 +95,7 @@
                   "title": "Is Multi",
                   "parts": [
                     {
-                      "part": 1,
+                      "part": 3,
                       "viewType": "select",
                       "fixValues": [
                         {
@@ -147,6 +149,32 @@
                       ]
                     }
                   ]
+                },
+                {
+                  "prpId": 7,
+                  "vocab": "AddToLog",
+                  "title": "AddToLog",
+                  "multi": false,
+                  "parts": [
+                    {
+                      "part": 1,
+                      "viewType": "checklist",
+                      "fixValues": [
+                        {
+                          "id": 1,
+                          "value": "",
+                          "schema": {
+                            "schemaId": 10,
+                            "paramUrl": "add-to-log",
+                            "lid": 1,
+                            "schemaVersion": 1.1
+                          }
+                        }
+                      ],
+                      "caption": "",
+                      "link": ""
+                    }
+                  ]
                 }
               ]
             },
@@ -163,9 +191,7 @@
                   "parts": [
                     {
                       "part": 1,
-                      "link": "/server/popup",
-                      "viewType": "html",
-                      "multi": false
+                      "viewType": "text"
                     }
                   ]
                 },
@@ -313,9 +339,7 @@
                   "parts": [
                     {
                       "part": 1,
-                      "link": "/server/popup",
-                      "viewType": "html",
-                      "multi": false
+                      "viewType": "text"
                     }
                   ]
                 },
@@ -371,9 +395,7 @@
                   "parts": [
                     {
                       "part": 1,
-                      "link": "/server/popup",
-                      "viewType": "html",
-                      "multi": false
+                      "viewType": "text"
                     }
                   ]
                 },
@@ -387,6 +409,122 @@
                     }
                   ]
                 },
+                {
+                  "prpId": 3,
+                  "title": "todayButton",
+                  "sectionId": 2,
+                  "parts": [
+                    {
+                      "part": 1,
+                      "viewType": "select",
+                      "fixValues": [
+                        {
+                          "id": 0,
+                          "value": "false"
+                        },
+                        {
+                          "id": 1,
+                          "value": "true"
+                        }
+                      ]
+                    }
+                  ]
+                },
+                {
+                  "prpId": 4,
+                  "title": "yearsList",
+                  "sectionId": 2,
+                  "parts": [
+                    {
+                      "part": 1,
+                      "viewType": "select",
+                      "fixValues": [
+                        {
+                          "id": 0,
+                          "value": "false"
+                        },
+                        {
+                          "id": 1,
+                          "value": "true"
+                        }
+                      ]
+                    }
+                  ]
+                },
+                {
+                  "prpId": 5,
+                  "title": "monthList",
+                  "sectionId": 2,
+                  "parts": [
+                    {
+                      "part": 1,
+                      "viewType": "select",
+                      "fixValues": [
+                        {
+                          "id": 0,
+                          "value": "false"
+                        },
+                        {
+                          "id": 1,
+                          "value": "true"
+                        }
+                      ]
+                    }
+                  ]
+                },
+                {
+                  "prpId": 6,
+                  "title": "rangeDates",
+                  "sectionId": 2,
+                  "parts": [
+                    {
+                      "part": 1,
+                      "viewType": "select",
+                      "fixValues": [
+                        {
+                          "id": 0,
+                          "value": "false"
+                        },
+                        {
+                          "id": 1,
+                          "value": "true"
+                        }
+                      ]
+                    }
+                  ]
+                },
+                {
+                  "prpId": 7,
+                  "title": "switchType",
+                  "sectionId": 2,
+                  "parts": [
+                    {
+                      "part": 1,
+                      "viewType": "select",
+                      "fixValues": [
+                        {
+                          "id": 0,
+                          "value": "false"
+                        },
+                        {
+                          "id": 1,
+                          "value": "true"
+                        }
+                      ]
+                    }
+                  ]
+                },
+                {
+                  "prpId": 8,
+                  "title": "style",
+                  "sectionId": 2,
+                  "parts": [
+                    {
+                      "part": 1,
+                      "viewType": "text"
+                    }
+                  ]
+                },
                 {
                   "prpId": 3001,
                   "title": "required",
@@ -413,6 +551,10 @@
                 {
                   "id": 1,
                   "title": "Validations"
+                },
+                {
+                  "id": 2,
+                  "title": "Options"
                 }
               ]
             },
@@ -524,9 +666,7 @@
                   "parts": [
                     {
                       "part": 1,
-                      "link": "/server/popup",
-                      "viewType": "html",
-                      "multi": false
+                      "viewType": "text"
                     }
                   ]
                 },
@@ -596,9 +736,7 @@
                   "parts": [
                     {
                       "part": 1,
-                      "link": "/server/popup",
-                      "viewType": "html",
-                      "multi": false
+                      "viewType": "text"
                     }
                   ]
                 },
@@ -620,17 +758,23 @@
                     {
                       "part": 1,
                       "viewType": "Text",
-                      "caption": "Value",
+                      "caption": "Id",
                       "validations": {
                         "dataType": "int"
                       }
                     },
                     {
                       "part": 2,
-                      "link": "/server/popup",
-                      "viewType": "html",
-                      "multi": true,
+                      "viewType": "text",
                       "caption": "Title"
+                    },
+                    {
+                      "part": 3,
+                      "viewType": "text",
+                      "caption": "priority",
+                      "validations": {
+                        "dataType": "float"
+                      }
                     }
                   ]
                 },
@@ -689,9 +833,7 @@
                   "parts": [
                     {
                       "part": 1,
-                      "link": "/server/popup",
-                      "viewType": "html",
-                      "multi": false
+                      "viewType": "text"
                     }
                   ]
                 },
@@ -713,17 +855,23 @@
                     {
                       "part": 1,
                       "viewType": "Text",
-                      "caption": "Value",
+                      "caption": "Id",
                       "validations": {
                         "dataType": "int"
                       }
                     },
                     {
                       "part": 2,
-                      "link": "/server/popup",
-                      "viewType": "html",
-                      "multi": true,
+                      "viewType": "text",
                       "caption": "Title"
+                    },
+                    {
+                      "part": 3,
+                      "viewType": "text",
+                      "caption": "priority",
+                      "validations": {
+                        "dataType": "float"
+                      }
                     }
                   ]
                 },
@@ -807,9 +955,7 @@
                   "parts": [
                     {
                       "part": 1,
-                      "link": "/server/popup",
-                      "viewType": "html",
-                      "multi": false
+                      "viewType": "text"
                     }
                   ]
                 },
@@ -831,17 +977,23 @@
                     {
                       "part": 1,
                       "viewType": "Text",
-                      "caption": "Value",
+                      "caption": "Id",
                       "validations": {
                         "dataType": "int"
                       }
                     },
                     {
                       "part": 2,
-                      "link": "/server/popup",
-                      "viewType": "html",
-                      "multi": true,
+                      "viewType": "text",
                       "caption": "Title"
+                    },
+                    {
+                      "part": 3,
+                      "viewType": "text",
+                      "caption": "priority",
+                      "validations": {
+                        "dataType": "float"
+                      }
                     }
                   ]
                 },
@@ -900,9 +1052,7 @@
                   "parts": [
                     {
                       "part": 1,
-                      "link": "/server/popup",
-                      "viewType": "html",
-                      "multi": false
+                      "viewType": "text"
                     }
                   ]
                 },
@@ -972,9 +1122,7 @@
                   "parts": [
                     {
                       "part": 1,
-                      "link": "/server/popup",
-                      "viewType": "html",
-                      "multi": false
+                      "viewType": "text"
                     }
                   ]
                 },
@@ -1093,9 +1241,7 @@
                   "parts": [
                     {
                       "part": 1,
-                      "link": "/server/popup",
-                      "viewType": "html",
-                      "multi": false
+                      "viewType": "text"
                     }
                   ]
                 },
@@ -1210,6 +1356,30 @@
                   "title": "Validations"
                 }
               ]
+            },
+            {
+              "paramUrl": "add-to-log",
+              "schemaVersion": 1.1,
+              "lid": 1,
+              "schemaId": "add-to-log",
+              "baseVocab": "http://schema.site/FA/vo",
+              "questions": [
+                {
+                  "prpId": 71,
+                  "vocab": "LogName",
+                  "title": "LogName",
+                  "multi": false,
+                  "parts": [
+                    {
+                      "part": 1,
+                      "viewType": "text",
+                      "validations": {
+                        "required": true
+                      }
+                    }
+                  ]
+                }
+              ]
             }
           ]
         }
diff --git a/server/schemas/newSchema/defaultQuestions.json b/server/schemas/newSchema/defaultQuestions.json
new file mode 100644
index 0000000..b677929
--- /dev/null
+++ b/server/schemas/newSchema/defaultQuestions.json
@@ -0,0 +1,96 @@
+{
+    "setting": {
+      "keepalive": true
+    },
+    "sources": [
+      {
+        "options": {
+          "tableName": "answer.data",
+          "keyFieldName": "",
+          "statusFieldName": "",
+          "mergeType": 0
+        },
+        "data": [
+          {
+            "lid": 1,
+            "questions": [
+              {
+                "TypeID": 150,
+                "Ord": 700,
+                "multi": false,
+                "class": "css_150",
+                "Url": "FA/vo/عنوان",
+                "title": "عنوان",
+                "parts": [
+                  {
+                    "part": 1,
+                    "viewType": "text",
+                    "cssClass": "css_150_1",
+                    "validations": {
+                      "required": true,
+                      "minLength": "2",
+                      "maxLength": "100"
+                    }
+                  }
+                ]
+              },
+              {
+                "TypeID": 164,
+                "Ord": 720,
+                "multi": false,
+                "class": "css_164",
+                "Url": "FA/vo/برند",
+                "title": "برند",
+                "parts": [
+                  {
+                    "part": 1,
+                    "viewType": "text",
+                    "cssClass": "css_164_1",
+                    "validations": {
+                      "minLength": "2",
+                      "maxLength": "4000"
+                    }
+                  }
+                ]
+              },
+              {
+                "TypeID": 163,
+                "Ord": 740,
+                "multi": false,
+                "class": "css_163",
+                "Url": "FA/vo/مدل",
+                "title": "مدل",
+                "parts": [
+                  {
+                    "part": 1,
+                    "viewType": "text",
+                    "cssClass": "css_163_1",
+                    "validations": {
+                      "minLength": "2",
+                      "maxLength": "4000"
+                    }
+                  }
+                ]
+              },
+              {
+                "TypeID": 144,
+                "Ord": 1220,
+                "multi": true,
+                "class": "css_144",
+                "Url": "FA/vo/توضیحات",
+                "title": "توضیحات",
+                "parts": [
+                  {
+                    "part": 1,
+                    "viewType": "textarea",
+                    "cssClass": "css_144_1",
+                    "validations": {}
+                  }
+                ]
+              }
+            ]
+          }
+        ]
+      }
+    ]
+  }
\ No newline at end of file
diff --git a/server/schemas/new/details.json b/server/schemas/newSchema/details.json
similarity index 85%
rename from server/schemas/new/details.json
rename to server/schemas/newSchema/details.json
index 61117c1..55167ab 100644
--- a/server/schemas/new/details.json
+++ b/server/schemas/newSchema/details.json
@@ -17,16 +17,6 @@
           "schemaVersion": 1.1,
           "lid": 2,
           "baseVocab": "http://schema.site/FA/vo",
-          "sections": [
-            {
-              "id": 1,
-              "title": "Sec 1",
-              "description": "Simple description"
-            },
-            {
-              "id": 2
-            }
-          ],
           "questions": [
             {
               "prpId": 1,
@@ -34,7 +24,7 @@
               "parts": [
                 {
                   "part": 1,
-                  "link": "/server/popup",
+                  "link": "/server/popup?isSchema=true",
                   "viewType": "html",
                   "multi": false
                 }
@@ -68,7 +58,6 @@
                 {
                   "part": 1,
                   "viewType": "text"
-
                 }
               ]
             }
diff --git a/server/schemas/newSchema/questions.json b/server/schemas/newSchema/questions.json
new file mode 100644
index 0000000..b150ac4
--- /dev/null
+++ b/server/schemas/newSchema/questions.json
@@ -0,0 +1,1363 @@
+{
+  "setting": {
+    "keepalive": true
+  },
+  "sources": [
+    {
+      "options": {
+        "tableName": "schema.newdata",
+        "keyFieldName": null,
+        "statusFieldName": null,
+        "mergeType": 0
+      },
+      "data": [
+        {
+          "schemas": [
+            {
+              "schemaId": "section",
+              "paramUrl": "section",
+              "schemaType": "section",
+              "title": "Section",
+              "image": "/assets/images/sections.png",
+              "questions": [
+                {
+                  "prpId": 1,
+                  "title": "Title",
+                  "parts": [
+                    {
+                      "part": 1,
+                      "link": "/server/popup?isSchema=false",
+                      "viewType": "html",
+                      "multi": false
+                    }
+                  ]
+                },
+                {
+                  "prpId": 2,
+                  "title": "Description",
+                  "parts": [
+                    {
+                      "part": 1,
+                      "viewType": "textarea",
+                      "cssClass": "css_13050_1"
+                    }
+                  ]
+                }
+              ]
+            },
+            {
+              "schemaId": "question",
+              "paramUrl": "question",
+              "schemaType": "question",
+              "title": "Question",
+              "image": "/assets/images/question.png",
+              "questions": [
+                {
+                  "prpId": 1,
+                  "title": "Title",
+                  "parts": [
+                    {
+                      "part": 1,
+                      "link": "/server/popup?isSchema=false",
+                      "viewType": "html",
+                      "multi": false
+                    }
+                  ]
+                },
+                {
+                  "prpId": 2,
+                  "title": "Parts",
+                  "parts": [
+                    {
+                      "part": 1,
+                      "viewType": "select",
+                      "fixValues": [
+                        {
+                          "id": 1,
+                          "value": "1"
+                        },
+                        {
+                          "id": 2,
+                          "value": "2"
+                        },
+                        {
+                          "id": 3,
+                          "value": "3"
+                        }
+                      ]
+                    }
+                  ]
+                },
+                {
+                  "prpId": 3,
+                  "title": "Is Multi",
+                  "parts": [
+                    {
+                      "part": 1,
+                      "viewType": "select",
+                      "fixValues": [
+                        {
+                          "id": 1,
+                          "value": "No"
+                        },
+                        {
+                          "id": 2,
+                          "value": "Yes"
+                        }
+                      ]
+                    }
+                  ]
+                },
+                {
+                  "prpId": 4,
+                  "title": "Css Class",
+                  "parts": [
+                    {
+                      "part": 1,
+                      "viewType": "text"
+                    }
+                  ]
+                },
+                {
+                  "prpId": 5,
+                  "title": "Help",
+                  "parts": [
+                    {
+                      "part": 1,
+                      "viewType": "text"
+                    }
+                  ]
+                },
+                {
+                  "prpId": 6,
+                  "title": "Use In List",
+                  "parts": [
+                    {
+                      "part": 1,
+                      "viewType": "select",
+                      "fixValues": [
+                        {
+                          "id": 1,
+                          "value": "No"
+                        },
+                        {
+                          "id": 2,
+                          "value": "Yes"
+                        }
+                      ]
+                    }
+                  ]
+                }
+              ]
+            },
+            {
+              "schemaId": "text",
+              "paramUrl": "text",
+              "schemaType": "part",
+              "title": "Short Text",
+              "image": "/assets/images/input.png",
+              "questions": [
+                {
+                  "prpId": 1,
+                  "title": "Caption",
+                  "parts": [
+                    {
+                      "part": 1,
+                      "link": "/server/popup?isSchema=false",
+                      "viewType": "html",
+                      "multi": false
+                    }
+                  ]
+                },
+                {
+                  "prpId": 2,
+                  "title": "Css Class",
+                  "parts": [
+                    {
+                      "part": 1,
+                      "viewType": "text"
+                    }
+                  ]
+                },
+                {
+                  "prpId": 3001,
+                  "title": "required",
+                  "sectionId": 1,
+                  "parts": [
+                    {
+                      "part": 1,
+                      "viewType": "select",
+                      "fixValues": [
+                        {
+                          "id": 0,
+                          "value": "No"
+                        },
+                        {
+                          "id": 1,
+                          "value": "Yes"
+                        }
+                      ]
+                    }
+                  ]
+                },
+                {
+                  "prpId": 3002,
+                  "title": "minLength",
+                  "sectionId": 1,
+                  "parts": [
+                    {
+                      "part": 1,
+                      "viewType": "text",
+                      "validations": {
+                        "dataType": "int"
+                      }
+                    }
+                  ]
+                },
+                {
+                  "prpId": 3003,
+                  "title": "maxLength",
+                  "sectionId": 1,
+                  "parts": [
+                    {
+                      "part": 1,
+                      "viewType": "text",
+                      "validations": {
+                        "dataType": "int"
+                      }
+                    }
+                  ]
+                },
+                {
+                  "prpId": 3004,
+                  "title": "min",
+                  "sectionId": 1,
+                  "parts": [
+                    {
+                      "part": 1,
+                      "viewType": "text",
+                      "validations": {
+                        "dataType": "int"
+                      }
+                    }
+                  ]
+                },
+                {
+                  "prpId": 3005,
+                  "title": "max",
+                  "sectionId": 1,
+                  "parts": [
+                    {
+                      "part": 1,
+                      "viewType": "text",
+                      "validations": {
+                        "dataType": "int"
+                      }
+                    }
+                  ]
+                },
+                {
+                  "prpId": 3006,
+                  "title": "dataType",
+                  "sectionId": 1,
+                  "parts": [
+                    {
+                      "part": 1,
+                      "viewType": "select",
+                      "fixValues": [
+                        {
+                          "id": 0,
+                          "value": "text"
+                        },
+                        {
+                          "id": "int",
+                          "value": "int"
+                        },
+                        {
+                          "id": "float",
+                          "value": "float"
+                        }
+                      ]
+                    }
+                  ]
+                },
+                {
+                  "prpId": 3007,
+                  "title": "regex",
+                  "sectionId": 1,
+                  "parts": [
+                    {
+                      "part": 1,
+                      "viewType": "text"
+                    }
+                  ]
+                }
+              ],
+              "sections": [
+                {
+                  "id": 1,
+                  "title": "Validations"
+                }
+              ]
+            },
+            {
+              "schemaId": "color",
+              "paramUrl": "color",
+              "schemaType": "part",
+              "title": "Color",
+              "image": "/assets/images/color.png",
+              "questions": [
+                {
+                  "prpId": 1,
+                  "title": "Caption",
+                  "parts": [
+                    {
+                      "part": 1,
+                      "link": "/server/popup?isSchema=false",
+                      "viewType": "html",
+                      "multi": false
+                    }
+                  ]
+                },
+                {
+                  "prpId": 2,
+                  "title": "Css Class",
+                  "parts": [
+                    {
+                      "part": 1,
+                      "viewType": "text"
+                    }
+                  ]
+                },
+                {
+                  "prpId": 3001,
+                  "title": "required",
+                  "sectionId": 1,
+                  "parts": [
+                    {
+                      "part": 1,
+                      "viewType": "select",
+                      "fixValues": [
+                        {
+                          "id": 0,
+                          "value": "No"
+                        },
+                        {
+                          "id": 1,
+                          "value": "Yes"
+                        }
+                      ]
+                    }
+                  ]
+                }
+              ],
+              "sections": [
+                {
+                  "id": 1,
+                  "title": "Validations"
+                }
+              ]
+            },
+            {
+              "schemaId": "datepicker",
+              "paramUrl": "datepicker",
+              "schemaType": "part",
+              "title": "Datepicker",
+              "image": "/assets/images/date.png",
+              "questions": [
+                {
+                  "prpId": 1,
+                  "title": "Caption",
+                  "parts": [
+                    {
+                      "part": 1,
+                      "link": "/server/popup?isSchema=false",
+                      "viewType": "html",
+                      "multi": false
+                    }
+                  ]
+                },
+                {
+                  "prpId": 2,
+                  "title": "Css Class",
+                  "parts": [
+                    {
+                      "part": 1,
+                      "viewType": "text"
+                    }
+                  ]
+                },
+                {
+                  "prpId": 3,
+                  "title": "todayButton",
+                  "sectionId": 2,
+                  "parts": [
+                    {
+                      "part": 1,
+                      "viewType": "select",
+                      "fixValues": [
+                        {
+                          "id": 0,
+                          "value": "false"
+                        },
+                        {
+                          "id": 1,
+                          "value": "true"
+                        }
+                      ]
+                    }
+                  ]
+                },
+                {
+                  "prpId": 4,
+                  "title": "yearsList",
+                  "sectionId": 2,
+                  "parts": [
+                    {
+                      "part": 1,
+                      "viewType": "select",
+                      "fixValues": [
+                        {
+                          "id": 0,
+                          "value": "false"
+                        },
+                        {
+                          "id": 1,
+                          "value": "true"
+                        }
+                      ]
+                    }
+                  ]
+                },
+                {
+                  "prpId": 5,
+                  "title": "monthList",
+                  "sectionId": 2,
+                  "parts": [
+                    {
+                      "part": 1,
+                      "viewType": "select",
+                      "fixValues": [
+                        {
+                          "id": 0,
+                          "value": "false"
+                        },
+                        {
+                          "id": 1,
+                          "value": "true"
+                        }
+                      ]
+                    }
+                  ]
+                },
+                {
+                  "prpId": 6,
+                  "title": "rangeDates",
+                  "sectionId": 2,
+                  "parts": [
+                    {
+                      "part": 1,
+                      "viewType": "select",
+                      "fixValues": [
+                        {
+                          "id": 0,
+                          "value": "false"
+                        },
+                        {
+                          "id": 1,
+                          "value": "true"
+                        }
+                      ]
+                    }
+                  ]
+                },
+                {
+                  "prpId": 7,
+                  "title": "switchType",
+                  "sectionId": 2,
+                  "parts": [
+                    {
+                      "part": 1,
+                      "viewType": "select",
+                      "fixValues": [
+                        {
+                          "id": 0,
+                          "value": "false"
+                        },
+                        {
+                          "id": 1,
+                          "value": "true"
+                        }
+                      ]
+                    }
+                  ]
+                },
+                {
+                  "prpId": 8,
+                  "title": "style",
+                  "sectionId": 2,
+                  "parts": [
+                    {
+                      "part": 1,
+                      "viewType": "text"
+                    }
+                  ]
+                },
+                {
+                  "prpId": 3001,
+                  "title": "required",
+                  "sectionId": 1,
+                  "parts": [
+                    {
+                      "part": 1,
+                      "viewType": "select",
+                      "fixValues": [
+                        {
+                          "id": 0,
+                          "value": "No"
+                        },
+                        {
+                          "id": 1,
+                          "value": "Yes"
+                        }
+                      ]
+                    }
+                  ]
+                }
+              ],
+              "sections": [
+                {
+                  "id": 1,
+                  "title": "Validations"
+                },
+                {
+                  "id": 2,
+                  "title": "Options"
+                }
+              ]
+            },
+            {
+              "schemaId": "textarea",
+              "paramUrl": "textarea",
+              "schemaType": "part",
+              "title": "Long Text",
+              "image": "/assets/images/text-box.png",
+              "questions": [
+                {
+                  "prpId": 1,
+                  "title": "Caption",
+                  "parts": [
+                    {
+                      "part": 1,
+                      "viewType": "text"
+                    }
+                  ]
+                },
+                {
+                  "prpId": 2,
+                  "title": "Css Class",
+                  "parts": [
+                    {
+                      "part": 1,
+                      "viewType": "text"
+                    }
+                  ]
+                },
+                {
+                  "prpId": 3001,
+                  "title": "required",
+                  "sectionId": 1,
+                  "parts": [
+                    {
+                      "part": 1,
+                      "viewType": "select",
+                      "fixValues": [
+                        {
+                          "id": 0,
+                          "value": "No"
+                        },
+                        {
+                          "id": 1,
+                          "value": "Yes"
+                        }
+                      ]
+                    }
+                  ]
+                },
+                {
+                  "prpId": 3002,
+                  "title": "minLength",
+                  "sectionId": 1,
+                  "parts": [
+                    {
+                      "part": 1,
+                      "viewType": "text",
+                      "validations": {
+                        "dataType": "int"
+                      }
+                    }
+                  ]
+                },
+                {
+                  "prpId": 3003,
+                  "title": "maxLength",
+                  "sectionId": 1,
+                  "parts": [
+                    {
+                      "part": 1,
+                      "viewType": "text",
+                      "validations": {
+                        "dataType": "int"
+                      }
+                    }
+                  ]
+                },
+                {
+                  "prpId": 3007,
+                  "title": "regex",
+                  "sectionId": 1,
+                  "parts": [
+                    {
+                      "part": 1,
+                      "viewType": "text"
+                    }
+                  ]
+                }
+              ],
+              "sections": [
+                {
+                  "id": 1,
+                  "title": "Validations"
+                }
+              ]
+            },
+            {
+              "schemaId": "AutoComplete",
+              "paramUrl": "AutoComplete",
+              "schemaType": "part",
+              "title": "Autocomplete",
+              "image": "/assets/images/autoComplete.png",
+              "questions": [
+                {
+                  "prpId": 1,
+                  "title": "Caption",
+                  "parts": [
+                    {
+                      "part": 1,
+                      "link": "/server/popup?isSchema=false",
+                      "viewType": "html",
+                      "multi": false
+                    }
+                  ]
+                },
+                {
+                  "prpId": 2,
+                  "title": "Css Class",
+                  "parts": [
+                    {
+                      "part": 1,
+                      "viewType": "text"
+                    }
+                  ]
+                },
+                {
+                  "prpId": 5,
+                  "title": "Url",
+                  "parts": [
+                    {
+                      "part": 1,
+                      "viewType": "text",
+                      "validations": {
+                        "required": true,
+                        "regex1": "https?:\\/\\/(www\\.)?[-a-zA-Z0-9@:%._\\+~#=]{1,256}\\.[a-zA-Z0-9()]{1,6}\\b([-a-zA-Z0-9()@:%_\\+.~#?&//=]*)"
+                      }
+                    }
+                  ]
+                },
+                {
+                  "prpId": 3001,
+                  "title": "required",
+                  "sectionId": 1,
+                  "parts": [
+                    {
+                      "part": 1,
+                      "viewType": "select",
+                      "fixValues": [
+                        {
+                          "id": 0,
+                          "value": "No"
+                        },
+                        {
+                          "id": 1,
+                          "value": "Yes"
+                        }
+                      ]
+                    }
+                  ]
+                }
+              ],
+              "sections": [
+                {
+                  "id": 1,
+                  "title": "Validations"
+                }
+              ]
+            },
+            {
+              "schemaId": "Select",
+              "paramUrl": "Select",
+              "schemaType": "part",
+              "title": "Select",
+              "image": "/assets/images/dropdown.png",
+              "questions": [
+                {
+                  "prpId": 1,
+                  "title": "Caption",
+                  "parts": [
+                    {
+                      "part": 1,
+                      "link": "/server/popup?isSchema=false",
+                      "viewType": "html",
+                      "multi": false
+                    }
+                  ]
+                },
+                {
+                  "prpId": 2,
+                  "title": "Css Class",
+                  "parts": [
+                    {
+                      "part": 1,
+                      "viewType": "text"
+                    }
+                  ]
+                },
+                {
+                  "prpId": 4,
+                  "title": "Items",
+                  "multi": "true",
+                  "parts": [
+                    {
+                      "part": 1,
+                      "viewType": "Text",
+                      "caption": "Id",
+                      "validations": {
+                        "dataType": "int"
+                      }
+                    },
+                    {
+                      "part": 2,
+                      "link": "/server/popup?isSchema=false",
+                      "viewType": "html",
+                      "multi": true,
+                      "caption": "Title"
+                    },
+                    {
+                      "part": 3,
+                      "viewType": "text",
+                      "caption": "priority",
+                      "validations": {
+                        "dataType": "float"
+                      }
+                    }
+                  ]
+                },
+                {
+                  "prpId": 5,
+                  "title": "Url",
+                  "parts": [
+                    {
+                      "part": 1,
+                      "viewType": "text",
+                      "validations": {
+                        "regex1": "https?:\\/\\/(www\\.)?[-a-zA-Z0-9@:%._\\+~#=]{1,256}\\.[a-zA-Z0-9()]{1,6}\\b([-a-zA-Z0-9()@:%_\\+.~#?&//=]*)"
+                      }
+                    }
+                  ]
+                },
+                {
+                  "prpId": 3001,
+                  "title": "required",
+                  "sectionId": 1,
+                  "parts": [
+                    {
+                      "part": 1,
+                      "viewType": "select",
+                      "fixValues": [
+                        {
+                          "id": 0,
+                          "value": "No"
+                        },
+                        {
+                          "id": 1,
+                          "value": "Yes"
+                        }
+                      ]
+                    }
+                  ]
+                }
+              ],
+              "sections": [
+                {
+                  "id": 1,
+                  "title": "Validations"
+                }
+              ]
+            },
+            {
+              "schemaId": "Checklist",
+              "paramUrl": "Checklist",
+              "schemaType": "part",
+              "title": "Checklist",
+              "image": "/assets/images/checklist.png",
+              "questions": [
+                {
+                  "prpId": 1,
+                  "title": "Caption",
+                  "parts": [
+                    {
+                      "part": 1,
+                      "link": "/server/popup?isSchema=false",
+                      "viewType": "html",
+                      "multi": false
+                    }
+                  ]
+                },
+                {
+                  "prpId": 2,
+                  "title": "Css Class",
+                  "parts": [
+                    {
+                      "part": 1,
+                      "viewType": "text"
+                    }
+                  ]
+                },
+                {
+                  "prpId": 4,
+                  "title": "Items",
+                  "multi": "true",
+                  "parts": [
+                    {
+                      "part": 1,
+                      "viewType": "Text",
+                      "caption": "Id",
+                      "validations": {
+                        "dataType": "int"
+                      }
+                    },
+                    {
+                      "part": 2,
+                      "link": "/server/popup?isSchema=false",
+                      "viewType": "html",
+                      "multi": true,
+                      "caption": "Title"
+                    },
+                    {
+                      "part": 3,
+                      "viewType": "text",
+                      "caption": "priority",
+                      "validations": {
+                        "dataType": "float"
+                      }
+                    }
+                  ]
+                },
+                {
+                  "prpId": 5,
+                  "title": "Url",
+                  "parts": [
+                    {
+                      "part": 1,
+                      "viewType": "text"
+                    }
+                  ]
+                },
+                {
+                  "prpId": 3001,
+                  "title": "required",
+                  "sectionId": 1,
+                  "parts": [
+                    {
+                      "part": 1,
+                      "viewType": "select",
+                      "fixValues": [
+                        {
+                          "id": 0,
+                          "value": "No"
+                        },
+                        {
+                          "id": 1,
+                          "value": "Yes"
+                        }
+                      ]
+                    }
+                  ]
+                },
+                {
+                  "prpId": 3002,
+                  "title": "minLength",
+                  "sectionId": 1,
+                  "parts": [
+                    {
+                      "part": 1,
+                      "viewType": "text",
+                      "validations": {
+                        "dataType": "int"
+                      }
+                    }
+                  ]
+                },
+                {
+                  "prpId": 3003,
+                  "title": "maxLength",
+                  "sectionId": 1,
+                  "parts": [
+                    {
+                      "part": 1,
+                      "viewType": "text",
+                      "validations": {
+                        "dataType": "int"
+                      }
+                    }
+                  ]
+                }
+              ],
+              "sections": [
+                {
+                  "id": 1,
+                  "title": "Validations"
+                }
+              ]
+            },
+            {
+              "schemaId": "Radio",
+              "paramUrl": "Radio",
+              "schemaType": "part",
+              "title": "Radio",
+              "image": "/assets/images/radio.png",
+              "questions": [
+                {
+                  "prpId": 1,
+                  "title": "Caption",
+                  "parts": [
+                    {
+                      "part": 1,
+                      "link": "/server/popup?isSchema=false",
+                      "viewType": "html",
+                      "multi": false
+                    }
+                  ]
+                },
+                {
+                  "prpId": 2,
+                  "title": "Css Class",
+                  "parts": [
+                    {
+                      "part": 1,
+                      "viewType": "text"
+                    }
+                  ]
+                },
+                {
+                  "prpId": 4,
+                  "title": "Items",
+                  "multi": "true",
+                  "parts": [
+                    {
+                      "part": 1,
+                      "viewType": "Text",
+                      "caption": "Id",
+                      "validations": {
+                        "dataType": "int"
+                      }
+                    },
+                    {
+                      "part": 2,
+                      "link": "/server/popup?isSchema=false",
+                      "viewType": "html",
+                      "multi": true,
+                      "caption": "Title"
+                    },
+                    {
+                      "part": 3,
+                      "viewType": "text",
+                      "caption": "priority",
+                      "validations": {
+                        "dataType": "float"
+                      }
+                    }
+                  ]
+                },
+                {
+                  "prpId": 5,
+                  "title": "Url",
+                  "parts": [
+                    {
+                      "part": 1,
+                      "viewType": "text",
+                      "validations": {
+                        "regex1": "https?:\\/\\/(www\\.)?[-a-zA-Z0-9@:%._\\+~#=]{1,256}\\.[a-zA-Z0-9()]{1,6}\\b([-a-zA-Z0-9()@:%_\\+.~#?&//=]*)"
+                      }
+                    }
+                  ]
+                },
+                {
+                  "prpId": 3001,
+                  "title": "required",
+                  "sectionId": 1,
+                  "parts": [
+                    {
+                      "part": 1,
+                      "viewType": "select",
+                      "fixValues": [
+                        {
+                          "id": 0,
+                          "value": "No"
+                        },
+                        {
+                          "id": 1,
+                          "value": "Yes"
+                        }
+                      ]
+                    }
+                  ]
+                }
+              ],
+              "sections": [
+                {
+                  "id": 1,
+                  "title": "Validations"
+                }
+              ]
+            },
+            {
+              "schemaId": "Lookup",
+              "paramUrl": "Lookup",
+              "schemaType": "part",
+              "title": "Lookup",
+              "image": "/assets/images/lookup.png",
+              "questions": [
+                {
+                  "prpId": 1,
+                  "title": "Caption",
+                  "parts": [
+                    {
+                      "part": 1,
+                      "link": "/server/popup?isSchema=false",
+                      "viewType": "html",
+                      "multi": false
+                    }
+                  ]
+                },
+                {
+                  "prpId": 2,
+                  "title": "Css Class",
+                  "parts": [
+                    {
+                      "part": 1,
+                      "viewType": "text"
+                    }
+                  ]
+                },
+                {
+                  "prpId": 5,
+                  "title": "Url",
+                  "parts": [
+                    {
+                      "part": 1,
+                      "viewType": "text",
+                      "validations": {
+                        "required": true,
+                        "regex1": "https?:\\/\\/(www\\.)?[-a-zA-Z0-9@:%._\\+~#=]{1,256}\\.[a-zA-Z0-9()]{1,6}\\b([-a-zA-Z0-9()@:%_\\+.~#?&//=]*)"
+                      }
+                    }
+                  ]
+                },
+                {
+                  "prpId": 3001,
+                  "title": "required",
+                  "sectionId": 1,
+                  "parts": [
+                    {
+                      "part": 1,
+                      "viewType": "select",
+                      "fixValues": [
+                        {
+                          "id": 0,
+                          "value": "No"
+                        },
+                        {
+                          "id": 1,
+                          "value": "Yes"
+                        }
+                      ]
+                    }
+                  ]
+                }
+              ],
+              "sections": [
+                {
+                  "id": 1,
+                  "title": "Validations"
+                }
+              ]
+            },
+            {
+              "schemaId": "Upload",
+              "paramUrl": "Upload",
+              "schemaType": "part",
+              "title": "Upload",
+              "image": "/assets/images/upload.png",
+              "questions": [
+                {
+                  "prpId": 1,
+                  "title": "Caption",
+                  "parts": [
+                    {
+                      "part": 1,
+                      "link": "/server/popup?isSchema=false",
+                      "viewType": "html",
+                      "multi": false
+                    }
+                  ]
+                },
+                {
+                  "prpId": 2,
+                  "title": "Css Class",
+                  "parts": [
+                    {
+                      "part": 1,
+                      "viewType": "text"
+                    }
+                  ]
+                },
+                {
+                  "prpId": 3,
+                  "title": "multiple",
+                  "parts": [
+                    {
+                      "part": 1,
+                      "viewType": "select",
+                      "fixValues": [
+                        {
+                          "id": 1,
+                          "value": "No"
+                        },
+                        {
+                          "id": 2,
+                          "value": "Yes"
+                        }
+                      ]
+                    }
+                  ]
+                },
+                {
+                  "prpId": 3001,
+                  "title": "required",
+                  "sectionId": 1,
+                  "parts": [
+                    {
+                      "part": 1,
+                      "viewType": "select",
+                      "fixValues": [
+                        {
+                          "id": 0,
+                          "value": "No"
+                        },
+                        {
+                          "id": 1,
+                          "value": "Yes"
+                        }
+                      ]
+                    }
+                  ]
+                },
+                {
+                  "prpId": 3008,
+                  "title": "mimes",
+                  "multi": "true",
+                  "sectionId": 1,
+                  "parts": [
+                    {
+                      "part": 1,
+                      "viewType": "Text",
+                      "caption": "mime"
+                    },
+                    {
+                      "part": 2,
+                      "viewType": "text",
+                      "caption": "minSize",
+                      "validations": {
+                        "dataType": "int"
+                      }
+                    },
+                    {
+                      "part": 3,
+                      "viewType": "text",
+                      "caption": "maxSize",
+                      "validations": {
+                        "dataType": "int"
+                      }
+                    }
+                  ]
+                },
+                {
+                  "prpId": 3009,
+                  "title": "size",
+                  "sectionId": 1,
+                  "parts": [
+                    {
+                      "part": 1,
+                      "viewType": "text",
+                      "validations": {
+                        "dataType": "int"
+                      }
+                    }
+                  ]
+                }
+              ],
+              "sections": [
+                {
+                  "id": 1,
+                  "title": "Validations"
+                }
+              ]
+            },
+            {
+              "schemaId": "Blob",
+              "paramUrl": "Blob",
+              "schemaType": "part",
+              "title": "Upload Multi Part",
+              "image": "/assets/images/upload.png",
+              "questions": [
+                {
+                  "prpId": 1,
+                  "title": "Caption",
+                  "parts": [
+                    {
+                      "part": 1,
+                      "link": "/server/popup?isSchema=false",
+                      "viewType": "html",
+                      "multi": false
+                    }
+                  ]
+                },
+                {
+                  "prpId": 2,
+                  "title": "Css Class",
+                  "parts": [
+                    {
+                      "part": 1,
+                      "viewType": "text"
+                    }
+                  ]
+                },
+                {
+                  "prpId": 3,
+                  "title": "multiple",
+                  "parts": [
+                    {
+                      "part": 1,
+                      "viewType": "select",
+                      "fixValues": [
+                        {
+                          "id": 1,
+                          "value": "No"
+                        },
+                        {
+                          "id": 2,
+                          "value": "Yes"
+                        }
+                      ]
+                    }
+                  ]
+                },
+                {
+                  "prpId": 4,
+                  "title": "upload token",
+                  "parts": [
+                    {
+                      "part": 1,
+                      "viewType": "text"
+                    }
+                  ]
+                },
+                {
+                  "prpId": 3001,
+                  "title": "required",
+                  "sectionId": 1,
+                  "parts": [
+                    {
+                      "part": 1,
+                      "viewType": "select",
+                      "fixValues": [
+                        {
+                          "id": 0,
+                          "value": "No"
+                        },
+                        {
+                          "id": 1,
+                          "value": "Yes"
+                        }
+                      ]
+                    }
+                  ]
+                },
+                {
+                  "prpId": 3008,
+                  "title": "mimes",
+                  "multi": "true",
+                  "sectionId": 1,
+                  "parts": [
+                    {
+                      "part": 1,
+                      "viewType": "Text",
+                      "caption": "mime"
+                    },
+                    {
+                      "part": 2,
+                      "viewType": "text",
+                      "caption": "minSize",
+                      "validations": {
+                        "dataType": "int"
+                      }
+                    },
+                    {
+                      "part": 3,
+                      "viewType": "text",
+                      "caption": "maxSize",
+                      "validations": {
+                        "dataType": "int"
+                      }
+                    }
+                  ]
+                },
+                {
+                  "prpId": 3009,
+                  "title": "size",
+                  "sectionId": 1,
+                  "parts": [
+                    {
+                      "part": 1,
+                      "viewType": "text",
+                      "validations": {
+                        "dataType": "int"
+                      }
+                    }
+                  ]
+                }
+              ],
+              "sections": [
+                {
+                  "id": 1,
+                  "title": "Validations"
+                }
+              ]
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}
diff --git a/server/schemas/popUp.html b/server/schemas/popUp.html
index 5968624..a186da2 100644
--- a/server/schemas/popUp.html
+++ b/server/schemas/popUp.html
@@ -113,28 +113,34 @@
     <button onclick="onSubmit()">تایید</button>
   </div>
   <script>
-    // Third party function
-
+    function getQueryParameter(name) {
+      const urlParams = new URLSearchParams(window.location.search);
+      return urlParams.get(name);
+    }
     function onSubmit() {
+      const isSchemaValue = getQueryParameter("isSchema");
       const selectedOption = $("#mySelect").select2("data")[0];
       if (selectedOption) {
         const value = selectedOption.text;
         const id = selectedOption.id;
-        const status  = selectedOption.status
+        const status = selectedOption.status;
         if (isNaN(id)) {
           // Check if id is not a number
-          fetch("/server/temp-schema-maker", {
-            method: "POST",
-            headers: {
-              "Content-Type": "application/json",
-            },
-            body: JSON.stringify({
-              value: value,
-            }),
-          }) 
+          fetch(
+            "/server/temp-schema-maker?isSchema=" +
+              isSchemaValue +
+              "&term=" +
+              value,
+            {
+              method: "GET",
+              headers: {
+                "Content-Type": "application/json",
+              },
+            }
+          )
             .then(async (response) => {
               const result = await response.json();
-              console.log(result)
+              console.log(result);
               bcCallback({ ...result, isSubmited: true });
             })
             .catch((error) => {
@@ -222,9 +228,12 @@
     function renderData(data) {
       const container = document.querySelector(".detailcontainer");
       let html = `<div class='test'>`;
-      for (let object of data) {
-        html += `<span>${object.culture} : ${object.title}</span> \n`;
+      if (data.status != "tempKeyWord") {
+        for (let object of data.rows) {
+          html += `<span>${object.culture} : ${object.title}</span> \n`;
+        }
       }
+
       html += `</div>`;
       container.innerHTML = html;
     }
diff --git a/src/SchemaUtil.ts b/src/SchemaUtil.ts
index 854ab15..70fdc0e 100644
--- a/src/SchemaUtil.ts
+++ b/src/SchemaUtil.ts
@@ -10,12 +10,14 @@ import {
   IMimes,
 } from "basiscore";
 
+interface IFixValueEx extends IFixValue {
+  priority : number
+}
 export default class SchemaUtil {
   private static readonly CAPTION_ID = 1;
   private static readonly CSS_CLASS_ID = 2;
   private static readonly MULTIPLE_ID = 3;
   private static readonly UPLOAD_TOKEN_ID = 4;
-
   private static readonly REQUIRED_VALIDATION_ID = 3001;
   private static readonly MIN_LENGTH_VALIDATION_ID = 3002;
   private static readonly MAX_LENGTH_VALIDATION_ID = 3003;
@@ -110,6 +112,64 @@ export default class SchemaUtil {
       answerSchema.properties.push(retVal);
     }
   }
+  public static addSimpleValuePropertyToSubSchema(
+    answerSchema: IAnswerSchema,
+    value: any,
+    prpId: number,
+    innerPrpId: number,
+    innerValue: string,
+    usedForId: number
+  ): void {
+    if (value != null && value != undefined) {
+      const partValue: IPartValue = {
+        id: 1,
+        value: value,
+        answer: {
+          usedForId: usedForId,
+          lastUpdate: "",
+          schemaVersion: "1.1",
+          schemaId: "add-to-log",
+          paramUrl: "add-to-log",
+          lid: 1,
+          properties: [
+            {
+              //@ts-ignore
+              prpId: innerPrpId,
+              answers: [
+                {
+                  id: 1,
+                  parts: [
+                    {
+                      part: 1,
+                      values: [
+                        {
+                          id: 1,
+                          value: innerValue,
+                        },
+                      ],
+                    },
+                  ],
+                },
+              ],
+            },
+          ],
+        },
+      };
+      const partCollection: IPartCollection = {
+        part: 1,
+        values: [partValue],
+      };
+      const answerPart: IAnswerPart = {
+        id: 0,
+        parts: [partCollection],
+      };
+      const retVal: IAnswerProperty = {
+        prpId: prpId,
+        answers: [answerPart],
+      };
+      answerSchema.properties.push(retVal);
+    }
+  }
 
   public static getPropertyValue(
     result: IUserActionResult,
@@ -136,6 +196,26 @@ export default class SchemaUtil {
     }
     return retVal;
   }
+  public static getSubSchema(
+    result: IUserActionResult,
+    propId: number,
+    part: number = 0
+  ): any {
+    let retVal: IUserActionResult = null;
+    const property = result.properties.find((x) => x.propId == propId);
+    if (property) {
+      if (property.edited) {
+        retVal = property.edited[0].parts[part].values[0].answer;
+      }
+      if (property.added) {
+        retVal = property.added[0].parts[part].values[0].answer;
+      }
+      if (property.deleted) {
+        retVal = property.deleted[0].parts[0].values[0].answer;
+      }
+    }
+    return retVal;
+  }
 
   public static getMimeValidationPropertyValue(
     result: IUserActionResult,
@@ -211,11 +291,9 @@ export default class SchemaUtil {
       SchemaUtil.CAPTION_ID
     );
   }
-
   public static getCaptionProperty(result: IUserActionResult) {
     return SchemaUtil.getPropertyValue(result, SchemaUtil.CAPTION_ID);
   }
-
   public static addCssClassProperty(
     answerSchema: IAnswerSchema,
     cssClass: string
@@ -245,7 +323,7 @@ export default class SchemaUtil {
   public static getMultipleProperty(result: IUserActionResult) {
     return SchemaUtil.getPropertyValue(result, SchemaUtil.MULTIPLE_ID);
   }
-  
+
   public static addUploadTokenProperty(
     answerSchema: IAnswerSchema,
     uploadToken: string
@@ -441,10 +519,17 @@ export default class SchemaUtil {
           part: 2,
           values: [valuePartValue],
         };
-
+        const priorityPartValue :IPartValue = {
+          id: 0,
+          value: index +1 ,
+        };
+        const priorityPartCollection: IPartCollection = {
+          part: 3,
+          values: [priorityPartValue],
+        };
         const answerPart: IAnswerPart = {
           id: value.id ?? -1 * (index + 1),
-          parts: [idPartCollection, valuePartCollection],
+          parts: [idPartCollection, valuePartCollection,priorityPartCollection],
         };
         answers.push(answerPart);
       });
@@ -458,10 +543,11 @@ export default class SchemaUtil {
 
   public static getFixValueProperty(
     result: IUserActionResult,
-    values: IFixValue[],
+    values: IFixValueEx[],
     propId: number
   ): IFixValue[] {
     const retVal = values ? [...values] : [];
+    console.log("alireza",result,values,propId)
     const property = result.properties.find((x) => x.propId == propId);
     if (property) {
       if (property.edited) {
@@ -475,6 +561,8 @@ export default class SchemaUtil {
               edited.id = parseInt(editedPart.values[0].value);
             } else if (editedPart.part == 2) {
               edited.value = editedPart.values[0].value;
+            } else if (editedPart.part == 3) {
+              edited.priority = editedPart.values[0].value;
             }
           });
         });
@@ -498,14 +586,20 @@ export default class SchemaUtil {
           const id = addedItem.parts.find((x) => x.part == 1)?.values[0].value;
           const value = addedItem.parts.find((x) => x.part == 2)?.values[0]
             .value;
-          const added: IFixValue = {
+          const priority = addedItem.parts.find((x) => x.part == 3)?.values[0]
+            .value;
+          const added: IFixValueEx = {
             id: id ? parseInt(id) : null,
             value: value,
+            priority : priority
           };
           retVal.push(added);
         });
+        
       }
     }
-    return retVal.length > 0 ? retVal : null;
+    return retVal.length > 0
+      ? retVal.sort((a, b) => a.priority - b.priority)
+      : null;
   }
 }
diff --git a/src/components/modules/IPartBaseModuleDataModel.ts b/src/components/modules/IPartBaseModuleDataModel.ts
index f15dd43..5632f67 100644
--- a/src/components/modules/IPartBaseModuleDataModel.ts
+++ b/src/components/modules/IPartBaseModuleDataModel.ts
@@ -8,4 +8,5 @@ export default interface IPartBaseModuleDataModel {
   dependency?: Array<IDependency>;
   multiple?: boolean;
   uploadToken?: string;
+  placeHolder?:string
 }
diff --git a/src/components/modules/ModuleFactory.ts b/src/components/modules/ModuleFactory.ts
index a64b14b..4a0387f 100644
--- a/src/components/modules/ModuleFactory.ts
+++ b/src/components/modules/ModuleFactory.ts
@@ -46,6 +46,7 @@ export default class ModuleFactory implements IModuleFactory {
         break;
       }
       case "question": {
+  
         module = new QuestionModule(owner, container, isABuiltIn, model);
         break;
       }
diff --git a/src/components/modules/PartBaseModule.ts b/src/components/modules/PartBaseModule.ts
index f24287c..973042c 100644
--- a/src/components/modules/PartBaseModule.ts
+++ b/src/components/modules/PartBaseModule.ts
@@ -10,7 +10,7 @@ import SchemaUtil from "../../SchemaUtil";
 import IPartBaseModuleDataModel from "./IPartBaseModuleDataModel";
 
 export default abstract class PartBaseModule<
-  TModelType extends IPartBaseModuleDataModel
+  TModelType extends IPartBaseModuleDataModel 
 > extends ToolboxModule {
   protected readonly data: Partial<TModelType> = {};
   protected readonly questionPartModel: IQuestionPart;
@@ -55,7 +55,6 @@ export default abstract class PartBaseModule<
     SchemaUtil.addCaptionProperty(ans, this.data.caption);
     SchemaUtil.addCssClassProperty(ans, this.data.cssClass);
     SchemaUtil.addValidationProperties(ans, this.data.validations);
-
     return ans;
   }
 
@@ -64,7 +63,6 @@ export default abstract class PartBaseModule<
     if (caption != null) {
       this.data.caption = caption;
     }
-
     const cssClass = SchemaUtil.getCssClassProperty(result);
     if (cssClass != null) {
       this.data.cssClass = cssClass;
diff --git a/src/components/modules/list-base/ListBaseModule.ts b/src/components/modules/list-base/ListBaseModule.ts
index 22918ec..4a874f4 100644
--- a/src/components/modules/list-base/ListBaseModule.ts
+++ b/src/components/modules/list-base/ListBaseModule.ts
@@ -26,7 +26,7 @@ export default abstract class ListBaseModule extends PartBaseModule<IListBaseMod
     super(layout, owner, component, schemaId, isABuiltIn, questionPart);
     if (questionPart) {
       this.data.link = questionPart.link;
-      this.data.fixValues = questionPart.fixValues;
+      this.data.fixValues = questionPart.fixValues
     }
   }
 
@@ -49,7 +49,11 @@ export default abstract class ListBaseModule extends PartBaseModule<IListBaseMod
     super.update(userAction);
     this.data.fixValues = SchemaUtil.getFixValueProperty(
       userAction,
-      this.data.fixValues,
+      this.data.fixValues ? this.data.fixValues.map((fixedValue,index)=>{
+        return {
+          ...fixedValue,priority : index + 1
+        }
+      }) : null ,
       ListBaseModule.FIX_VALUES_ID
     );
 
diff --git a/src/components/modules/question/IQuestionModuleDataModel.ts b/src/components/modules/question/IQuestionModuleDataModel.ts
index 1951c76..dc10f8a 100644
--- a/src/components/modules/question/IQuestionModuleDataModel.ts
+++ b/src/components/modules/question/IQuestionModuleDataModel.ts
@@ -1,12 +1,13 @@
 import { HTMLValueType } from "basiscore";
 
-
 export default interface IQuestionModuleDataModel {
-  titleData : HTMLValueType,
+  titleData: HTMLValueType;
   title: string | HTMLValueType;
   part: number;
   multi: boolean;
   cssClass: string;
   help: string;
   useInList?: boolean;
+  addToLog?: boolean;
+  logName? :string;
 }
diff --git a/src/components/modules/question/QuestionModule.ts b/src/components/modules/question/QuestionModule.ts
index db5e5f9..9984838 100644
--- a/src/components/modules/question/QuestionModule.ts
+++ b/src/components/modules/question/QuestionModule.ts
@@ -22,6 +22,7 @@ export default class QuestionModule extends ContainerModule {
   private static readonly CSS_CLASS_ID = 4;
   private static readonly HELP_URL_ID = 5;
   private static readonly USE_IN_LIST_ID = 6;
+  private static readonly ADD_LOG_ID = 7;
 
   private readonly _data: Partial<IQuestionModuleDataModel>;
   private readonly _schema: IQuestion;
@@ -36,6 +37,19 @@ export default class QuestionModule extends ContainerModule {
   getTitleData() {
     return this._data.titleData;
   }
+  set addToLog(value: boolean) {
+    this._data.addToLog = value;
+  }
+  get addToLog() {
+    return this._data.addToLog;
+  }
+  set logName(value: string) {
+    this._data.logName = value;
+  }
+  get logName(): string {
+    return this._data.logName;
+  }
+
   get title(): string | HTMLValueType {
     return this._data.title;
   }
@@ -104,8 +118,9 @@ export default class QuestionModule extends ContainerModule {
     } else {
       this._data = {
         multi: false,
-        title: { value: "test value", id: 0 },
+        title: "test title",
         part: 1,
+        logName : "test title"
       };
     }
     this.title = this._data.title as string;
@@ -148,6 +163,11 @@ export default class QuestionModule extends ContainerModule {
       this._data.useInList ? "2" : "1",
       QuestionModule.USE_IN_LIST_ID
     );
+    SchemaUtil.addSimpleValuePropertyToSubSchema(
+      ans,
+      this._data.addToLog ? "1" : null,
+      QuestionModule.ADD_LOG_ID,71,this.logName,this.usedForId
+    );
     return ans;
   }
 
@@ -187,6 +207,18 @@ export default class QuestionModule extends ContainerModule {
       result,
       QuestionModule.USE_IN_LIST_ID
     );
+    const addToLog = SchemaUtil.getPropertyValue(
+      result,
+      QuestionModule.ADD_LOG_ID
+    );
+    this.addToLog = addToLog ? true : false;
+    if (this.addToLog) {
+      const subSchema = SchemaUtil.getSubSchema(result, QuestionModule.ADD_LOG_ID);
+      this.logName = SchemaUtil.getPropertyValue(
+        subSchema,
+        71
+      )
+    }
     if (useInList != null) {
       this._data.useInList = useInList == "2";
     }
@@ -196,7 +228,6 @@ export default class QuestionModule extends ContainerModule {
     const sectionId = this.owner
       .closest("[data-drop-acceptable-container-schema-type]")
       .getAttribute("data-bc-section-id");
-
     const question: IQuestion = {
       ...(this._schema && { prpId: this._schema.prpId }),
       ...(this._schema && { typeId: this._schema.typeId }),
@@ -211,12 +242,15 @@ export default class QuestionModule extends ContainerModule {
       ...(this._data.titleData && {
         titleData: this.getTitleData(),
       }),
+
       ...(this._schema && { wordId: this._schema.wordId }),
       ...(this._data.multi && { multi: this._data.multi }),
       ...(sectionId && { sectionId: parseInt(sectionId) }),
       ...(this._data.cssClass && { cssClass: this._data.cssClass }),
       ...(this._data.help && { help: this._data.help }),
       ...(this._data.useInList && { useInList: this._data.useInList }),
+      ...(this._data.addToLog && { addToLog: this._data.addToLog }),
+      ...(this.logName && {logName : this.logName}),
       parts: null,
     };
 
diff --git a/src/components/modules/section/SectionModule.ts b/src/components/modules/section/SectionModule.ts
index b28ba3f..3e15bb9 100644
--- a/src/components/modules/section/SectionModule.ts
+++ b/src/components/modules/section/SectionModule.ts
@@ -63,7 +63,7 @@ export default class SectionModule extends ContainerModule {
     if (!this._data) {
       this._data = {
         id: this.usedForId,
-        title: { id: 0, value: "test title" },
+        title : "test title" ,
         description: "",
       };
     }
diff --git a/src/components/modules/text-base/ITextBaseModuleDataModel.ts b/src/components/modules/text-base/ITextBaseModuleDataModel.ts
index 7948d00..ca1286e 100644
--- a/src/components/modules/text-base/ITextBaseModuleDataModel.ts
+++ b/src/components/modules/text-base/ITextBaseModuleDataModel.ts
@@ -1,4 +1,7 @@
 import IPartBaseModuleDataModel from "../IPartBaseModuleDataModel";
+import IDatepickerOptions from "./date-picker/DatePickerOptions";
 
 export default interface ITextBaseModuleDataModel
-  extends IPartBaseModuleDataModel {}
+  extends IPartBaseModuleDataModel {
+  options?: Partial<IDatepickerOptions>
+}
diff --git a/src/components/modules/text-base/date-picker/DatePickerModule.ts b/src/components/modules/text-base/date-picker/DatePickerModule.ts
index 63c16fe..eaad38e 100644
--- a/src/components/modules/text-base/date-picker/DatePickerModule.ts
+++ b/src/components/modules/text-base/date-picker/DatePickerModule.ts
@@ -1,16 +1,85 @@
-import { IQuestionPart } from "basiscore";
+import SchemaUtil from "../../../../SchemaUtil";
 import IWorkspaceComponent from "../../../workspace/IWorkspaceComponent";
 import TextBaseModule from "../TextBaseModule";
 import layout from "./assets/layout.html";
 import "./assets/style.css";
+import IDateQuestionPart from "./IDateQuestionPart";
+import {
+  IFixValue,
+  IQuestionPart,
+  ViewType,
+  IAnswerSchema,
+  IUserActionResult,
+} from "basiscore";
 
 export default class DatePickerModule extends TextBaseModule {
+  private readonly TODAY_BUTTON_ID = 3;
+  private readonly YEARS_LIST_ID = 4;
+  private readonly MONTH_LIST_ID = 5;
+  protected readonly RANGE_DATES_ID = 6;
+  protected readonly SWITCH_TYPE_ID = 7;
+  protected readonly STYLE_ID = 8;
+
   constructor(
     owner: HTMLElement,
     component: IWorkspaceComponent,
     isABuiltIn: boolean,
-    model: IQuestionPart
+    questionPart: IDateQuestionPart
   ) {
-    super(layout, owner, component, "Datepicker", isABuiltIn, model);
+    super(layout, owner, component, "Datepicker", isABuiltIn, questionPart);
+    if (questionPart) {
+      this.data.options = {
+        todayButton: questionPart.todayButton,
+        yearsList: questionPart.yearsList,
+        monthList: questionPart.monthList,
+        rangeDates: questionPart.rangeDates,
+        switchType: questionPart.switchType,
+        style: questionPart.style,
+      };
+    }
+  }
+
+  protected getAnswerSchema(): IAnswerSchema {
+    var ans = super.getAnswerSchema();
+    SchemaUtil.addSimpleValueProperty(
+      ans,
+      this.data.options.todayButton == true ? 1 : 0,
+      this.TODAY_BUTTON_ID
+    );
+    SchemaUtil.addSimpleValueProperty(
+      ans,
+      this.data.options.yearsList == true ? 1 : 0,
+      this.YEARS_LIST_ID
+    );
+    SchemaUtil.addSimpleValueProperty(
+      ans,
+      this.data.options.yearsList == true ? 1 : 0,
+      this.MONTH_LIST_ID
+    );
+    SchemaUtil.addSimpleValueProperty(
+      ans,
+      this.data.options.rangeDates == true ? 1 : 0,
+      this.RANGE_DATES_ID
+    );
+    SchemaUtil.addSimpleValueProperty(
+      ans,
+      this.data.options.switchType == true ? 1 : 0,
+      this.SWITCH_TYPE_ID
+    );
+    SchemaUtil.addSimpleValueProperty(
+      ans,
+      this.data.options.style,
+      this.STYLE_ID
+    );
+    return ans;
+  }
+  public update(userAction: IUserActionResult): void {
+    super.update(userAction);
+    this.data.options.monthList = SchemaUtil.getPropertyValue(userAction,this.MONTH_LIST_ID) == 1 
+    this.data.options.yearsList = SchemaUtil.getPropertyValue(userAction,this.YEARS_LIST_ID) == 1 
+    this.data.options.rangeDates = SchemaUtil.getPropertyValue(userAction,this.RANGE_DATES_ID) == 1 
+    this.data.options.todayButton = SchemaUtil.getPropertyValue(userAction,this.TODAY_BUTTON_ID) == 1 
+    this.data.options.switchType = SchemaUtil.getPropertyValue(userAction,this.SWITCH_TYPE_ID) == 1 
+    this.data.options.style= SchemaUtil.getPropertyValue(userAction,this.SWITCH_TYPE_ID)
   }
 }
diff --git a/src/components/modules/text-base/date-picker/DatePickerOptions.ts b/src/components/modules/text-base/date-picker/DatePickerOptions.ts
new file mode 100644
index 0000000..ade3140
--- /dev/null
+++ b/src/components/modules/text-base/date-picker/DatePickerOptions.ts
@@ -0,0 +1,8 @@
+export default interface IDatepickerOptions {
+  "todayButton": boolean,
+  "yearsList" : boolean,
+  "monthList":boolean,
+  "rangeDates": boolean,
+  "switchType" : boolean,
+  "style": string
+}
diff --git a/src/components/modules/text-base/date-picker/IDateQuestionPart.ts b/src/components/modules/text-base/date-picker/IDateQuestionPart.ts
new file mode 100644
index 0000000..71a46c5
--- /dev/null
+++ b/src/components/modules/text-base/date-picker/IDateQuestionPart.ts
@@ -0,0 +1,10 @@
+import { IQuestionPart } from "basiscore";
+
+export default interface IDateQuestionPart extends IQuestionPart {
+  todayButton: boolean;
+  yearsList: boolean;
+  monthList: boolean;
+  rangeDates: boolean;
+  switchType: boolean;
+  style: string;
+}
diff --git a/src/components/property-box/assets/layout.html b/src/components/property-box/assets/layout.html
index 05adbd0..ab8b38e 100644
--- a/src/components/property-box/assets/layout.html
+++ b/src/components/property-box/assets/layout.html
@@ -18,3 +18,4 @@
     <button data-btn-add="" data-sys-button="">اعمال تغییرات</button>
   </div>
 </div>
+
diff --git a/src/components/property-box/assets/style.css b/src/components/property-box/assets/style.css
index 130f35d..ca0aa19 100644
--- a/src/components/property-box/assets/style.css
+++ b/src/components/property-box/assets/style.css
@@ -183,4 +183,7 @@
 [data-bc-properties-container] [data-bc-fm-lookup] input[type="text"] {
     margin-left: 0;
     margin-right: 10px;
-}
\ No newline at end of file
+}
+[data-bc-sm-sub-schema-container] [data-bc-part-container] {
+    width : -webkit-fill-available
+  }
\ No newline at end of file
diff --git a/src/components/workspace/WorkspaceComponent.ts b/src/components/workspace/WorkspaceComponent.ts
index 8145294..4957931 100644
--- a/src/components/workspace/WorkspaceComponent.ts
+++ b/src/components/workspace/WorkspaceComponent.ts
@@ -572,7 +572,7 @@ export default class WorkspaceComponent
     const rowProperties = detailSource.rows[0]?.properties;
     const schemaVersion = this.findElementByPropId(rowProperties, 3)?.added[0].parts[0].values[0].value ??this.findElementByPropId(rowProperties, 3)?.edited[0].parts[0].values[0].value
     const lid = parseInt(
-      this.findElementByPropId(rowProperties, 2)?.added[0].parts[0].values[0] ?? this.findElementByPropId(rowProperties, 2)?.edited[0].parts[0].values[0].value
+      this.findElementByPropId(rowProperties, 2)?.added[0].parts[0].values[0].value ?? this.findElementByPropId(rowProperties, 2)?.edited[0].parts[0].values[0].value
         .value
     );
     const schemaName = this.findElementByPropId(rowProperties, 1)?.added[0]
diff --git a/src/components/workspace/assets/layout.html b/src/components/workspace/assets/layout.html
index 1e6be9a..bfda5f1 100644
--- a/src/components/workspace/assets/layout.html
+++ b/src/components/workspace/assets/layout.html
@@ -25,6 +25,7 @@
         </div>
         <div>
           <div data-bc-sm-board data-drop-acceptable-container-schema-type="section question" data-sys-sm-board=""></div>
+        </div>  
       </div>
       <div data-get-btns>
         <button data-get-btn data-bc-sm-schema-result data-sys-button="">پیش نمایش</button>
diff --git a/src/components/workspace/assets/style.css b/src/components/workspace/assets/style.css
index 6597084..28f7e0c 100644
--- a/src/components/workspace/assets/style.css
+++ b/src/components/workspace/assets/style.css
@@ -233,7 +233,7 @@
 [data-bc-part-related-cell] {
   margin-left: 0px !important;
 }
-[data-bc-title-container] {
+[data-details] [data-bc-title-container] {
   width: 130px !important;
   height: 30px !important;
   margin-left: 0px;
diff --git a/wwwroot/component/edit/index.html b/wwwroot/component/edit/index.html
index fb1a0a2..709f549 100644
--- a/wwwroot/component/edit/index.html
+++ b/wwwroot/component/edit/index.html
@@ -42,6 +42,6 @@ <h3>Sample autocomplete Data Url: /server/autocomplete?term=${term}</h3>
         },
       };
     </script>
-    <script src="/basiscore.js"></script>
+    <script src="http://localhost:3000/basiscore.js"></script>
   </body>
 </html>
diff --git a/wwwroot/component/new/index.html b/wwwroot/component/new/index.html
index 10e0049..6976c58 100644
--- a/wwwroot/component/new/index.html
+++ b/wwwroot/component/new/index.html
@@ -1,38 +1,51 @@
 <!DOCTYPE html>
 <html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>Schema Maker Command - Zero Config</title>
+    <link href="/assets/css/style.css" rel="stylesheet" type="text/css" />
+  </head>
 
-<head>
-  <meta charset="UTF-8" />
-  <meta http-equiv="X-UA-Compatible" content="IE=edge" />
-  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-  <title>Schema Maker Command - Zero Config</title>
-  <link href="/assets/css/style.css" rel="stylesheet" type="text/css" />
-</head>
-
-<body>
-  <!-- <div dir="ltr">
+  <body>
+    <!-- <div dir="ltr">
     <h3>Sample Fix Data Url: /server/fix-data/13057/${part}</h3>
     <h3>Sample autocomplete Data Url: /server/autocomplete?term=${term}</h3>
   </div> -->
+    <basis
+    core="api"
+    url="/server/schemas/new"
+    method="get"
+    run="atclient"
+  ></basis>
 
-  <basis core="api" url="/server/schemas/new" method="get" run="atclient"></basis>
-
-  <basis core="component.schemaMaker.schemaMaker" run="atclient" dataMemberName="schema.data" resultSourceId="schema.result" saveDraft="true"></basis>
-  <basis core="callback" run="atClient" triggers="schema.result" method="displayResult"></basis>
-
-  <script>
-    const host = {
-      repositories: {
-        schemaMaker: "/schema-maker.js",
-      },
-    };
-
-    function displayResult(args) {
-      console.table(args.source?.rows[0]);
-      console.log(args.source?.rows[0]);
-    }
-  </script>
-  <script src="/basiscore.js"></script>
-</body>
+  <basis
+    core="component.schemaMaker.schemaMaker"
+    run="atclient"
+    dataMemberName="schema.data"
+    resultSourceId="schema.result"
+    saveDraft="false"
+    defaultQuestionsUrl="/server/defaultQuestions"
+  ></basis>
+  <basis
+    core="callback"
+    run="atClient"
+    triggers="schema.result"
+    method="displayResult"
+  ></basis>
+    <script>
+      const host = {
+        repositories: {
+          schemaMaker: "/schema-maker.js",
+        },
+      };
 
-</html>
\ No newline at end of file
+      function displayResult(args) {
+        console.table(args.source?.rows[0]);
+        console.log(args.source?.rows[0]);
+      }
+    </script>
+    <script src="http://localhost:3000/basiscore.js"></script>
+  </body>
+</html>
diff --git a/wwwroot/component/new/schema/index.html b/wwwroot/component/new/schema/index.html
index 37830f8..d651bd8 100644
--- a/wwwroot/component/new/schema/index.html
+++ b/wwwroot/component/new/schema/index.html
@@ -1,38 +1,52 @@
 <!DOCTYPE html>
 <html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>Schema Maker Command - Zero Config</title>
+    <link href="/assets/css/style.css" rel="stylesheet" type="text/css" />
+  </head>
 
-<head>
-  <meta charset="UTF-8" />
-  <meta http-equiv="X-UA-Compatible" content="IE=edge" />
-  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-  <title>Schema Maker Command - Zero Config</title>
-  <link href="/assets/css/style.css" rel="stylesheet" type="text/css" />
-</head>
-
-<body>
-  <!-- <div dir="ltr">
+  <body>
+    <!-- <div dir="ltr">
     <h3>Sample Fix Data Url: /server/fix-data/13057/${part}</h3>
     <h3>Sample autocomplete Data Url: /server/autocomplete?term=${term}</h3>
   </div> -->
+    <basis
+      core="api"
+      url="/server/new-schema"
+      method="get"
+      run="atclient"
+    ></basis>
 
-  <basis core="api" url="/server/schemas/new" method="get" run="atclient"></basis>
-
-  <basis core="component.schemaMaker.schemaMaker" run="atclient" dataMemberName="schema.data" resultSourceId="schema.result" saveDraft="false" objectTypeUrl="/server/objectType" groupsUrl="/server/groupsUrl" defaultQuestionsUrl="/server/defaultQuestions"></basis>
-  <basis core="callback" run="atClient" triggers="schema.result" method="displayResult"></basis>
-
-  <script>
-    const host = {
-      repositories: {
-        schemaMaker: "/schema-maker.js",
-      },
-    };
-
-    function displayResult(args) {
-      console.table(args.source?.rows[0]);
-      console.log(args.source?.rows[0]);
-    }
-  </script>
-  <script src="http://localhost:3000/basiscore.js"></script>
-</body>
+    <basis
+      core="component.schemaMaker.schemaMaker"
+      run="atclient"
+      objectTypeUrl="/server/objectType"
+      groupsUrl="/server/groupsUrl"
+      dataMemberName="schema.newdata"
+      resultSourceId="schema.results"
+      saveDraft="true"
+    ></basis>
+    <basis
+      core="callback"
+      run="atClient"
+      triggers="schema.results"
+      method="displayResult"
+    ></basis>
+    <script>
+      const host = {
+        repositories: {
+          schemaMaker: "/schema-maker.js",
+        },
+      };
 
-</html>
\ No newline at end of file
+      function displayResult(args) {
+        console.table(args.source?.rows[0]);
+        console.log(args.source?.rows[0]);
+      }
+    </script>
+    <script src="http://localhost:3000/basiscore.js"></script>
+  </body>
+</html>