added weights to module and question and some refactor

techbizz-nepal · Dec 17, 2023 · 950dae5 · 950dae5
1 parent dc8913d
commit 950dae5
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 5 deletions.
diff --git a/app/DTO/Questionnaire/ModuleData.php b/app/DTO/Questionnaire/ModuleData.php
@@ -26,7 +26,8 @@ public function __construct(
         public Optional|Carbon|null $created_at,
         public Optional|Carbon|null $updated_at,
         public Optional|Carbon|null $deleted_at,
-        public Optional|string|null $assessment_id
+        public Optional|string|null $assessment_id,
+        public int $weight = 0
     ) {
         $this->slug ??= Str::slug($this->name);
     }

diff --git a/app/DTO/Questionnaire/QuestionData.php b/app/DTO/Questionnaire/QuestionData.php
@@ -19,6 +19,7 @@ public function __construct(
         public Optional|Carbon|null $deleted_at,
         public Optional|string|null $module_id,
         public QuestionType $type,
+        public int $weight = 0,
         public int $order = 0,
     ) {
     }

diff --git a/database/migrations/2023_10_24_225722_create_modules_table.php b/database/migrations/2023_10_24_225722_create_modules_table.php
@@ -18,6 +18,7 @@ public function up(): void
             $table->string('slug')->index();
             $table->text('description')->nullable();
             $table->string('material')->nullable();
+            $table->integer('weight')->default(0);
             $table->timestamps();
             $table->softDeletes();
         });

diff --git a/database/migrations/2023_10_25_112046_create_questions_table.php b/database/migrations/2023_10_25_112046_create_questions_table.php
@@ -17,6 +17,7 @@ public function up(): void
             $table->text('body');
             $table->integer('order')->default(0);
             $table->string('type', 2);
+            $table->integer('weight')->default(0);
             $table->timestamps();
             $table->softDeletes();
         });

diff --git a/resources/views/questionnaire/admin/questions/types/describe-image/create.blade.php b/resources/views/questionnaire/admin/questions/types/describe-image/create.blade.php
@@ -58,7 +58,7 @@ class="progress-bar"
             <div class="col-10">
                 <input id="id1" type="hidden" name="questions[0][id]" value="{{\Illuminate\Support\Str::uuid()}}">
                 <input name="questions[0][body]" type="text" class="form-control mb-2" placeholder="Write question 1"
-                       @required(true) minlength="5" pattern="[a-zA-Z0-9]+"
+                       @required(true) minlength="5"
                        id="questions1">
             </div>
             <div class="col-2" onclick="removeInputBox(this)">

diff --git a/resources/views/questionnaire/admin/questions/types/describe-image/edit.blade.php b/resources/views/questionnaire/admin/questions/types/describe-image/edit.blade.php
@@ -68,7 +68,7 @@ class="progress-bar"
                         <input name="questions[{{$loop->index}}][body]"
                                value="{{$item['body']}}"
                                type="text"
-                               @required(true) minlength="5" pattern="[a-zA-Z0-9]+"
+                               @required(true) minlength="5"
                                class="form-control mb-2"
                                placeholder="Write question 1"
                                id="questions{{$loop->iteration}}">

diff --git a/resources/views/questionnaire/admin/questions/types/read-and-answer/create.blade.php b/resources/views/questionnaire/admin/questions/types/read-and-answer/create.blade.php
@@ -19,7 +19,7 @@
             <div class="col-10">
                 <input id="id1" type="hidden" name="questions[0][id]" value="{{\Illuminate\Support\Str::uuid()}}">
                 <input name="questions[0][body]" type="text" class="form-control mb-2" placeholder="Write question 1"
-                       @required(true) minlength="5" pattern="[a-zA-Z0-9]+"
+                       @required(true) minlength="5"
                        id="questions1">
             </div>
             <div class="col-2" onclick="removeInputBox(this)">

diff --git a/resources/views/questionnaire/admin/questions/types/read-and-answer/edit.blade.php b/resources/views/questionnaire/admin/questions/types/read-and-answer/edit.blade.php
@@ -25,7 +25,7 @@
                         <input name="questions[{{$loop->index}}][body]"
                                value="{{$item['body']}}"
                                type="text"
-                               @required(true) minlength="5" pattern="[a-zA-Z0-9]+"
+                               @required(true) minlength="5"
                                class="form-control mb-2"
                                placeholder="Write question 1"
                                id="questions{{$loop->iteration}}">