ayanova/src/plugins/vuetify.js

@@ -82,6 +82,7 @@ import {
   faFileMedicalAlt,
   faFilePdf,
   faFilePowerpoint,
+  faFileUpload,
   faFileVideo,
   faFileWord,
   faFilter,
@@ -228,6 +229,7 @@ library.add(
   faFileMedicalAlt,
   faFilePdf,
   faFilePowerpoint,
+  faFileUpload,
   faFileVideo,
   faFileWord,
   faFilter,
@@ -652,6 +654,12 @@ const CUSTOM_ICONS = {
       icon: ["fas", "file-powerpoint"]
     }
   },
+  ayiFileUpload: {
+    component: FontAwesomeIcon,
+    props: {
+      icon: ["fas", "file-upload"]
+    }
+  },
   ayiFileVidio: {
     component: FontAwesomeIcon,
     props: {

ayanova/src/views/adm-import.vue

@@ -1,43 +1,46 @@
 <template>
   <div>
-    <v-col cols="12" sm="6" lg="4" xl="3">
+    <v-row>
-      <v-select
+      <v-col cols="12" sm="6" lg="4" xl="3">
-        v-model="ayaType"
+        <v-select
-        :items="selectLists.coreAyaTypes"
+          v-model="ayaType"
-        item-text="name"
+          :items="selectLists.coreAyaTypes"
-        item-value="id"
+          item-text="name"
-        :label="$ay.t('AyaType')"
+          item-value="id"
-        ref="ayaType"
+          :label="$ay.t('AyaType')"
-        data-cy="ayaType"
+          ref="ayaType"
-      ></v-select>
+          data-cy="ayaType"
-    </v-col>
+        ></v-select>
-    <v-col>
+      </v-col>
-      <v-file-input
+      <v-col cols="12" sm="6" lg="4" xl="3">
-        v-model="uploadFiles"
+        <v-file-input
-        :label="$ay.t('Import')"
+          v-model="uploadFiles"
-        accept="application/json"
+          :label="$ay.t('Import')"
-        prepend-icon="$ayiFile-upload"
+          accept="application/json"
-        multiple
+          prepend-icon="$ayiFileUpload"
-        chips
+          multiple
-      ></v-file-input>
+          chips
-      <v-btn
+        ></v-file-input
-        v-if="uploadFiles.length > 0 && ayaType != 0"
+        ><v-btn
-        :loading="uploading"
+          v-if="uploadFiles.length > 0 && ayaType != 0"
-        color="primary"
+          :loading="uploading"
-        text
+          color="primary"
-        @click="upload"
+          text
-        >{{ $ay.t("Upload") }}</v-btn
+          @click="upload"
-      >
+          >{{ $ay.t("Upload") }}</v-btn
-    </v-col>
+        >
-    <v-col>
+      </v-col>
-      <v-textarea
+
-        v-model="importResult"
+      <v-col cols="12">
-        full-width
+        <v-textarea
-        readonly
+          v-model="importResult"
-        auto-grow
+          full-width
-        data-cy="importResult"
+          readonly
-      ></v-textarea>
+          auto-grow
-    </v-col>
+          data-cy="importResult"
+        ></v-textarea>
+      </v-col>
+    </v-row>
   </div>
 </template>
 
@@ -63,7 +66,6 @@ export default {
       ayaType: 0,
       importResult: "",
       rights: window.$gz.role.defaultRightsObject(),
-      reload: false,
       uploading: false
     };
   },
@@ -72,7 +74,7 @@ export default {
       //similar code in wiki-control
       let vm = this;
       let fileData = [];
-      let importResult="";
+      let importResult = "";
       for (let i = 0; i < vm.uploadFiles.length; i++) {
         let f = vm.uploadFiles[i];
         fileData.push({ name: f.name, lastModified: f.lastModified });
@@ -89,8 +91,12 @@ export default {
           window.$gz.errorHandler.handleFormError(res.error);
         } else {
           vm.uploadFiles = [];
-          vm.importResult = res.data;
+          //result is an array of strings
-          this.reload = !this.reload;
+          let outText = "";
+          res.data.forEach(function appendImportResultItem(value) {
+            outText += value + "\n";
+          });
+          vm.importResult = outText;
         }
       } catch (error) {
         window.$gz.errorHandler.handleFormError(error);

ayanova/src/views/adm-report-templates.vue

@@ -16,7 +16,7 @@
       v-model="uploadFiles"
       :label="$ay.t('Import')"
       accept=".ayrt"
-      prepend-icon="$ayiFile-upload"
+      prepend-icon="$ayiFileUpload"
       multiple
       chips
     ></v-file-input>

ayanova/src/views/adm-translations.vue

@@ -15,7 +15,7 @@
       v-model="uploadFiles"
       :label="$ay.t('Import')"
       accept="application/json"
-      prepend-icon="$ayiFile-upload"
+      prepend-icon="$ayiFileUpload"
       multiple
       chips
     ></v-file-input>