Merge branch 'master' into dev-vj

app/Http/Controllers/HomeController.php

@@ -632,6 +632,7 @@ FROM measurement
 WHERE measurement.label NOT IN ('SBP', 'DBP')
   AND (measurement.is_cellular_zero = FALSE or measurement.is_cellular_zero IS NULL)
   AND measurement.is_removed IS FALSE
+  AND measurement.has_been_stamped_by_mcp IS FALSE
   AND measurement.ts IS NOT NULL
   AND measurement.client_bdt_measurement_id IS NOT NULL
   AND (measurement.status IS NULL OR (measurement.status <> 'ACK' AND measurement.status <> 'INVALID_ACK'))

resources/views/layouts/patient.blade.php

@@ -652,7 +652,7 @@
                                         </div>
                                     </section>--}}
                                     <section class="hide-inside-popup screen-only vbox mt-2 align-self-start ml-4">
-                                        {{--
+                                        
                                         <div moe>
                                             <button start show><i class="fa fa-plus text-sm text-secondary"></i>&nbsp;Note
                                             </button>
@@ -702,7 +702,7 @@
                                                     <button submit class="btn btn-primary btn-sm">submit</button>
                                                 </div>
                                             </form>
-                                        </div> --}}
+                                        </div>
                                         <div>
                                             <div moe relative>
                                                 <button start show><i class="fa fa-plus text-sm text-secondary"></i>&nbsp;SMS