Merge branch 'main' into production

src/components/PatientModal.vue

@@ -77,9 +77,11 @@ export default {
   methods: {
     convertTags: function(tags){
       console.log(tags)
-      return this.patient.protocolNumbers = tags.map((x) => {
-        return {number: parseInt(x.text)}
+      let newTags = {}
+      tags.forEach((x) => {
+        newTags[parseInt(x.text)] = new dayjs().format('YYYY-MM-DDTHH:mm:ssZ')
       })
+      return newTags
     },
     showPatient: function(patient){
       this.patient = patient;
@@ -107,12 +109,14 @@ export default {
     },
     tags: function(){
       console.log(this.patient.protocolNumbers)
-      return this.patient.protocolNumbers.map((x) => {
-        return {
-          text: x.number + " (" + dayjs(x.addedDate).format('DD/MM/YYYY') + ")",
+      let tags = []
+      for(const num in this.patient.protocolNumbers){
+        tags.push({
+          text: num.toString() + " (" + dayjs(this.patient.protocolNumbers[num]).format('DD/MM/YYYY') + ")",
           style: "background-color: rgba(29, 78, 216, var(--tw-bg-opacity))"
-        }
-      })
+        })
+      }
+      return tags
     }
   }
 }

src/main.js

@@ -6,14 +6,14 @@ import Toast from "vue-toastification";
 import "vue-toastification/dist/index.css";
 import axios from "axios";
 
-axios.defaults.baseURL = 'https://api.metisapp.net'
+axios.defaults.baseURL = process.env.NODE_ENV === 'development' ? 'http://localhost:9090' : 'https://api.metisapp.net'
 
 Vue.use(Toast, {});
 
 //Devtools variables
 Vue.config.performance = process.env.NODE_ENV === 'development'
 Vue.config.development = process.env.NODE_ENV === 'development'
-Vue.config.productionTip = process.env.NODE_ENV !== 'development'
+Vue.config.productionTip = process.env.NODE_ENV === 'development'
 
 new Vue({
   router,