C1J0ET - add icd10 stemcell validation

GIT_WORKFLOW.md

@@ -62,10 +62,21 @@ master
 
 - Sebelum push atau menyiapkan merge, jalankan `git fetch origin`.
 - Rebase ke base remote yang benar supaya conflict muncul lebih awal.
+- Kalau target merge adalah `staging`, sync branch kerja ke `origin/staging`, bukan ke `origin/master`.
+- Kalau target merge adalah `master`, sync branch kerja ke `origin/master`.
 - Jangan direct push ke protected branch.
 - `master` dan `staging` dipakai sebagai branch tujuan PR.
 - Untuk repo ini, upload ke `devcpone` dilakukan dari commit di `master` atau `staging`.
 
+## Patokan Sebelum Merge
+
+- Target akhir `staging`
+  Branch kerja harus update dulu dari `staging`.
+- Target akhir `master`
+  Branch kerja harus update dulu dari `master`.
+
+Kalau `staging` dipakai paralel oleh beberapa fitur, jangan patokan ke `master` saat mau merge ke `staging`, karena bisa ada fitur lain yang sudah lebih dulu masuk `staging` tetapi belum masuk `master`.
+
 ## Contoh Skenario 1
 
 Kasus:
@@ -107,6 +118,20 @@ git rebase origin/master
 
 Kalau branch kerja memang berbasis `staging`, ganti target rebase ke `origin/staging`.
 
+Kalau target merge akhirnya `staging`, contoh yang benar:
+
+```bash
+git fetch origin
+git rebase origin/staging
+```
+
+Kalau target merge akhirnya `master`, contoh yang benar:
+
+```bash
+git fetch origin
+git rebase origin/master
+```
+
 ### 3. Commit dan push
 
 ```bash

apps/components/oneTanggal.vue

@@ -1,10 +1,10 @@
 <template>
    <div class="tanggal">
       {{f_tanggal}}
-      <span class="hidden-sm-and-down" style="color:brown; margin-left:20px;font-weight:bold;font-size:16px;">
+      <span class="hidden-sm-and-down" style="color:#fff59d; margin-left:20px;font-weight:bold;font-size:16px;">
          {{branch_name}}
       </span>
-      <div class="visible-sm-and-down hidden-md-and-up" style="color:brown; font-weight:bold;font-size:10px;">
+      <div class="visible-sm-and-down hidden-md-and-up" style="color:#fff59d; font-weight:bold;font-size:10px;">
          Devone <!-- {{branch_name}} -->
       </div>
    </div>
@@ -32,9 +32,15 @@ module.exports = {
    }
    ,computed: {
       branch_name() {
-         let branch = this.$store.state.system.branch 
-         if (branch.M_BranchName == undefined) return ''
-         return branch.M_BranchName 
+         try {
+            let retrievedObject = localStorage.getItem("user")
+            if (!retrievedObject) return ''
+            let dtuser = JSON.parse(retrievedObject)
+            if (dtuser.M_BranchName == undefined) return ''
+            return dtuser.M_BranchName
+         } catch(e) {
+            return ''
+         }
       },
       f_tanggal() {
          try {

test/vuex/one-fo-registration-walk-in-stemcell/api/patient.js

@@ -243,12 +243,12 @@ export async function edit(datas, id) {
       }
    }
 
-   export async function search_icd10(prm) {
-      try {
-         var resp = await axios.post(URL + 'patient/search_icd10', prm);
-         if (resp.status != 200) {
-            return {
-               status: "ERR",
+   export async function search_icd10(prm) {
+      try {
+         var resp = await axios.post(URL + 'order/search_icd10', prm);
+         if (resp.status != 200) {
+            return {
+               status: "ERR",
                message: resp.statusText
             };
          }

test/vuex/one-fo-registration-walk-in-stemcell/components/patientDetail.vue

@@ -248,24 +248,24 @@
                         ></v-textarea>
                   </v-flex>
    
-                  <!----<v-flex xs12 pa-1>
-                     <v-autocomplete
-                        label="ICD-10"
-                        v-model="selected_icd10"
-                        :items="icd10"
+                  <v-flex xs12 pa-1>
+                     <v-autocomplete
+                        label="ICD-10"
+                        v-model="selected_icd10"
+                        :items="icd10"
                         :search-input.sync="search_icd10"
                         class="pb-2"
                         no-filter
                         :item-text="item => item.code + ' - ' + item.display"
                         item-value="code"
                         return-object
-                        :loading="loading_icd10"
-                        no-data-text="Ketikkan pencarian ICD-10"
-                        clearable
-                        >
-                 
-                     </v-autocomplete>
-                  </v-flex>-->
+                        :loading="loading_icd10"
+                        no-data-text="Ketikkan pencarian ICD-10"
+                        clearable
+                        >
+                 
+                     </v-autocomplete>
+                  </v-flex>
                  
                </v-flex>
             </v-layout>
@@ -425,4 +425,4 @@
       }
    }
    </script>
-   
+   

test/vuex/one-fo-registration-walk-in-stemcell/modules/order.js

@@ -175,6 +175,18 @@ export default {
    },
    actions: {
       async save(context) {
+         let diagnosa = context.state.diagnosa ? context.state.diagnosa.trim() : ''
+         let selectedIcd10 = context.rootState.patient.selected_icd10 || {}
+         let icd10Code = selectedIcd10.code ? selectedIcd10.code.toString().trim() : ''
+
+         if (!diagnosa && !icd10Code) {
+            context.commit('update_in_saving', false)
+            context.commit('update_loading_process', false)
+            context.commit('update_dialog_loading', false, { root: true })
+            context.commit('update_message_error', 'Diagnosa atau ICD-10 wajib diisi salah satu')
+            context.commit('update_dialog_pop_up_error', true)
+            return
+         }
 
          var req = [];
          var detail = [];
@@ -224,9 +236,9 @@ export default {
          prm.selected_patient = context.rootState.patient.selected_patient
          prm.patient_age = context.rootState.patient.selected_patient.patient_age
          prm.patient_note = context.state.patient_note
-         prm.diagnosa = context.state.diagnosa
+         prm.diagnosa = diagnosa
          prm.catatan_fo = context.state.catatan_fo
-         prm.selected_icd10 = context.rootState.patient.selected_icd10
+         prm.selected_icd10 = selectedIcd10
          prm.selected_doctor = context.rootState.doctor.selected_doctor
          prm.selected_language = context.rootState.language.selected_language ? context.rootState.language.selected_language.id : 1
          prm.selected_language_2 = context.rootState.language.selected_language_2 ? context.rootState.language.selected_language_2.id : 0

test/vuex/one-fo-registration-walk-in-stemcell/modules/patient.js

@@ -472,9 +472,10 @@ export default  {
                context.commit("update_loading_icd10",false)
                context.commit("update_search_error_message",resp.message)
             } else {
+               let records = Array.isArray(resp.data) ? resp.data : (resp.data && resp.data.records ? resp.data.records : [])
                context.commit("update_loading_icd10",false)
                context.commit("update_search_error_message","")
-               context.commit("update_icd10", resp.data.records)
+               context.commit("update_icd10", records)
             }
          } catch(e) {
             context.commit("update_loading_icd10",false)