瀏覽代碼

Merge branch 'dev' of rav.triplestart.com:jmudaka/stagfe2 into dev

Josh 4 年之前
父節點
當前提交
bbc38320e9
共有 2 個文件被更改,包括 15 次插入3 次删除
  1. 9 1
      public/js/mc-init.js
  2. 6 2
      resources/views/app/dashboard.blade.php

+ 9 - 1
public/js/mc-init.js

@@ -5,7 +5,15 @@ window.addMCInitializer = function(_name, _func) {
 window.runMCInitializers = function() {
     if(!!mcInitializers) {
         for(var func in mcInitializers) {
-            if(mcInitializers.hasOwnProperty(func)) mcInitializers[func]();
+            if(mcInitializers.hasOwnProperty(func)) {
+                try {
+                    mcInitializers[func]();
+                }
+                catch(e) {
+                    console.warn('MC init error: ', e);
+                    console.warn('Initer: ', func);
+                }
+            }
         }
     }
 };

+ 6 - 2
resources/views/app/dashboard.blade.php

@@ -109,7 +109,11 @@
                         <div>
                             Status: <b class="text-secondary">@{{ event.status }}</b>
                             &nbsp;/&nbsp;
-                            <span relative class="ml-1" moe>
+                            <a target="_top" :href="'/patients/view/' + event.clientUid + '/manage-appointment/' + event.uid">
+                                <i class="fa fa-edit"></i>
+                                Edit Appointment
+                            </a>
+                            {{--<span relative class="ml-1" moe>
                                 <a start show v-on:click.prevent="return showEditForm($event.target)">
                                     <i class="fa fa-edit"></i>
                                     Edit Appointment
@@ -161,7 +165,7 @@
                                                 v-on:click.prevent="return cancelEditForm($event.target)">Cancel</button>
                                     </div>
                                 </form>
-                            </span>
+                            </span>--}}
                         </div>
                     </div>
                     <div class="ml-auto">