Feature/660 bulk upload issues

backend/api/v1/v1_forms/management/commands/form_seeder.py

@@ -72,13 +72,14 @@ def handle(self, *args, **options):
                     self.stdout.write(
                         f"Form Updated | {form.name} V{form.version}")
             # question group loop
-            for qg in json_form["question_groups"]:
+            for qgi, qg in enumerate(json_form["question_groups"]):
                 question_group, created = QG.objects.update_or_create(
                     name=qg["question_group"],
                     form=form,
                     defaults={
                         "name": qg["question_group"],
-                        "form": form
+                        "form": form,
+                        "order": qgi + 1
                     })
                 if created:
                     question_group.save()

backend/api/v1/v1_forms/migrations/0019_questiongroup_order.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.0.4 on 2022-08-04 09:00
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('v1_forms', '0018_questions_extra'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='questiongroup',
+            name='order',
+            field=models.BigIntegerField(default=None, null=True),
+        ),
+    ]

backend/api/v1/v1_forms/models.py

@@ -67,6 +67,7 @@ class QuestionGroup(models.Model):
                              on_delete=models.CASCADE,
                              related_name='form_question_group')
     name = models.TextField()
+    order = models.BigIntegerField(null=True, default=None)
 
     def __str__(self):
         return self.name

backend/api/v1/v1_forms/serializers.py

@@ -172,7 +172,7 @@ class WebFormDetailSerializer(serializers.ModelSerializer):
     @extend_schema_field(ListQuestionGroupSerializer(many=True))
     def get_question_group(self, instance: Forms):
         return ListQuestionGroupSerializer(
-            instance=instance.form_question_group.all(),
+            instance=instance.form_question_group.all().order_by('order'),
             many=True,
             context={
                 'user': self.context.get('user')

backend/utils/export_form.py

@@ -9,8 +9,10 @@
 
 
 def get_definition(form: Forms):
-    questions = form.form_questions.all()
+    questions = questions = Questions.objects.filter(form=form).order_by(
+        "question_group__order", "order").all()
     framed = []
+    indexer = 1
     for q in [qs.to_definition() for qs in questions]:
         rule = ""
         dependency = ""
@@ -39,7 +41,8 @@ def get_definition(form: Forms):
                     "option": o,
                     "required": "YES" if q["required"] else "NO",
                     "rule": rule,
-                    "dependency": dependency
+                    "dependency": dependency,
+                    "indexer": indexer
                 })
         else:
             framed.append({
@@ -51,29 +54,27 @@ def get_definition(form: Forms):
                 "option": "",
                 "required": "YES" if q["required"] else "NO",
                 "rule": rule,
-                "dependency": dependency
+                "dependency": dependency,
+                "indexer": indexer
             })
+        indexer += 1
     return framed
 
 
 def generate_definition_sheet(form: Forms):
     definitions = get_definition(form=form)
     df = pd.DataFrame(definitions)
-    df = df.sort_values(by=["qg_id", "order"])
-    df["indexer"] = df.apply(lambda x: str(x["qg_id"]) + str(x["order"]),
-                             axis=1)
     selected_columns = [
         "indexer", "id", "question", "type", "required", "dependency",
-        "option", "rule"
-    ]
+        "option", "rule"]
     df = df[selected_columns]
     df = df.groupby(selected_columns).first()
     return df.droplevel('indexer')
 
 
 def generate_excel(form: Forms, user: SystemUser):
-    questions = Questions.objects.filter(form=form).order_by(
-        "question_group_id", "order").all()
+    questions = questions = Questions.objects.filter(form=form).order_by(
+        "question_group__order", "order").all()
     data = pd.DataFrame(
         columns=['{0}|{1}'.format(q.id, q.name) for q in questions], index=[0])
     form_name = form.name

frontend/src/pages/upload-data/UploadData.jsx

@@ -74,6 +74,9 @@ const UploadData = () => {
   };
 
   const selectedAdministration = takeRight(administration, 1)[0]?.name;
+  // Do not allow to bulk upload without selecting atleast one admin level
+  const allowBulkUpload =
+    formId && takeRight(administration, 1)[0]?.level !== 0;
 
   useEffect(() => {
     if (formId && selectedAdministration && user) {
@@ -126,7 +129,7 @@ const UploadData = () => {
     maxCount: 1,
     showUploadList: false,
     accept: allowedFiles.join(","),
-    disabled: !fileName || uploading,
+    disabled: !allowBulkUpload || !fileName || uploading,
     customRequest: uploadRequest,
     onChange: onChange,
   };
@@ -291,7 +294,7 @@ const UploadData = () => {
                       : text.dropFile
                     : text.selectForm}
                 </p>
-                <Button disabled={!formId} loading={uploading}>
+                <Button disabled={!allowBulkUpload} loading={uploading}>
                   {text.browseComputer}
                 </Button>
               </Dragger>