Vineela | MOBN-1151 | Fix timeout issue while switching from day view… #33

binduak · 2020-04-17T05:05:49Z

… to week view and viceversa in ot calendar view

kirity-mahanty · 2020-04-17T06:19:14Z

ui/app/ot/controller/otCalendarController.js

@@ -123,19 +124,22 @@ angular.module('bahmni.ot')
                $interval.cancel(timer);
            });

+            $scope.$watch("weekOrDay", function (   ) {


Remove the extra space from function ( ).

kirity-mahanty · 2020-04-17T06:23:06Z

ui/app/ot/controller/otCalendarController.js

@@ -41,7 +41,8 @@ angular.module('bahmni.ot')
                            });
                        });
                        $scope.blockedOtsOfTheWeek = getBlockedOtsOfTheWeek();
-                    });
+                        $scope.viewchanged = false;


May be isViewLoaded is a better name here for the flag.

kirity-mahanty · 2020-04-17T06:24:18Z

ui/app/ot/controller/otCalendarController.js

                    }
                }
            });
-            spinner.forPromise(init());
+            spinner.forPromise(init()).then (function () {spinner.forPromise(init())});


Why are we calling spinner.forPromise() again? Can't understand this part.

shivarach · 2020-04-17T06:35:38Z

ui/app/ot/controller/otCalendarController.js

                    }
                }
            });
-            spinner.forPromise(init());
+            spinner.forPromise(init()).then (function () {spinner.forPromise(init())});


…extension point with specified input fields validation (Bahmni#402) * Create build_and_upload_artifact.yml Action to build Bahmni Apps and upload to Github workflow * Update build_and_upload_artifact.yml * Update build_and_upload_artifact.yml * Update build_and_upload_artifact.yml * Update build_and_upload_artifact.yml * Update build_and_upload_artifact.yml * Update build_and_upload_artifact.yml * Update build_and_upload_artifact.yml * Update build_and_upload_artifact.yml * Update build_and_upload_artifact.yml * Update build_and_upload_artifact.yml * Update build_and_upload_artifact.yml * Update build_and_upload_artifact.yml * Update build_and_upload_artifact.yml * Update build_and_upload_artifact.yml * Update build_and_upload_artifact.yml * Update README.md * Update LICENSE * BAH-1397 | Updated branch (#43) * [Mahesh] Adds driver code for ndhm integration * [Mahesh] Resolves review comments * [Mahesh] Adds driver code for ndhm integration (#8) * [Mahesh] Adds driver code for ndhm integration * [Mahesh] Resolves review comments * [Mahesh] Makes all test cases pass * 119|131|Lalitha|Nazeer| Adds style for healthId verfication page * 117 | Meghna/Sree | Adds styles for dialog box and makes health-id field non editable on bahmni * Disables verify-health-id btn for existing patient and shows empty field for existing patient * refactors to remove extra ng-if * 177-Mahesh|Swati updates the healthId in bahmniapps registration page after successfull verification * 177-Mahesh|Swati makes all the testcases pass * 177-Mahesh|Swati makes the extra identifier healthId name as a constant * 177-Mahesh Makes verify health id button visible for already existing patients who are not verified their healthId * 177-Mahesh Resolves review comments * 169 reactjs iframe (#15) * 146 | Meghna/Sree | Adds style for headings of the table * 146|Sree Ranjani/Nazeer | Fixes table data going outside borders * 169 - lalitha/mahesh - added iframe to integrate with ndhm react * 169-Mahesh|Meghna changes the static url to variable * 169-Mahesh Adds style to the ndhm-iframe to look like a pop-up Co-authored-by: meghna <meghna.tanwal@thoughworks.com> Co-authored-by: Shaik Nazeer <nazeer.shaik@thoughtworks.com> Co-authored-by: Srilalitha V <lolboch@gmail.com> * Update build_and_upload_artifact.yml * 135 demographic fetch (#16) * 146 | Meghna/Sree | Adds style for headings of the table * 146|Sree Ranjani/Nazeer | Fixes table data going outside borders * 169 - lalitha/mahesh - added iframe to integrate with ndhm react * 169-Mahesh|Meghna changes the static url to variable * 135-Mahesh receives the data from ndhm window and updates in bahmni registration page * 135-Mahesh removes print statements * 135-Mahesh shows/hides the verify-healthId-button based on the patient * 135-Mahesh removes unwanted styles Co-authored-by: meghna <meghna.tanwal@thoughworks.com> Co-authored-by: Shaik Nazeer <nazeer.shaik@thoughtworks.com> Co-authored-by: Srilalitha V <lolboch@gmail.com> * Update build_and_upload_artifact.yml * 135-Mahesh closes the pop-up when clicks on the close (#18) * 181-Mahesh Redirects to the patient clinical dashboard when an event triggered from ndhm-ui * 181-Mahesh Redirects to the patient profile summary page * 218-Mahesh opens fresh ndhm ui when you click on the button everytime * Update build_and_upload_artifact.yml * 221-Mahesh|Meghna|Sree Adds Reflects the changed details in the edit patient page * 221-Mahesh|Meghna|Sree Removes print statements * 221-Mahesh|Meghna|Sree Fixes updates patient changed details correctly * 230|[Tazeen|Nazeer]|Adds change in phone number based on user profile * Bahmniapps deploy (#20) * 202| Nazeer/Sree Ranjani | Adds deployment script * 202| Nazeer/Sree Ranjani | Removes unwanted lines * 230|Nazeer/Tazeen| Removed extra line * 195-[Mahesh] Fixes maps ndhm middleName to bahmni middleName * 263-[Mahesh] Adds searchs using health id in all modules * 326: Rohit|Tazeen: storing PHR address as an identifier ins addition to health ID (#30) Co-authored-by: swatigogia2020 <swati.gogia@thoughtworks.com> * 326 phraddress (#31) * 326: Rohit|Tazeen: storing PHR address as an identifier ins addition to health ID * swati: making syntax change * Nazeer|Resloved indentation issue (#32) * 365|Sameera|Nazeer|Refactors made demographic fields non editable after heatlhId verfication (#33) * 385|Sameera|Adds. input validation for program and clinical module * 402|Sameera|Nazeer|Adds. disable verify healthId button and demographics non-editable when HealthId is deactivated * 402|Sameera| disable verify healthId button when health id is present * 402|Sameera| Refactors. HealthId deactivation status api * Rohit|Sameera| Resolved chief complaint stored as Non coded chief complaint conflict * Sameera| Adds. create new record will create a new patient * 363|Sameera| Fixed build errors * Sameera| Fixing error for IdDeactiavtion * Sameera| Bug Fixed. on click of home and search from registration page, patient key should be removed from localStorage * BUG - Birthdate estimated checkbox ticked after fetching NDHM data * Swati| Re-naming Health_Id and PHR_address * Swati| renaming the health id button to abha * BAH-1397: Renaming ndhm variable to be more genric and updating the label of verify button co-authored-by: SanoferSameera <sanofersameera25@gmail.com> * BAH-1397 | changed. mapping of patient object based on fhir patient object Co-authored-by: Swati Gogia <swati.gogia@thoughtworks.com> * BAH-1397 | Added. function to calculate dob from age and renamed variables Co-authored-by: Swati Gogia <swati.gogia@thoughtworks.com> * BAH-1397 | Refactored. changed localStorage to scope variable Co-authored-by: Swati Gogia <swati.gogia@thoughtworks.com> * BAH-1397 | Refactored. to handle multiple extension points Co-authored-by: Swati Gogia <swati.gogia@thoughtworks.com> * BAH-1397 | Refactored. to display one verify button per extension Co-authored-by: Swati Gogia <swati.gogia@thoughtworks.com> * BAH-1397 | Refactored. to disable attributes based on extension point definition Co-authored-by: Swati Gogia <swati.gogia@thoughtworks.com> * BAH-1397 | Refactored. to fix edit patient functionality - initial changes Co-authored-by: Swati Gogia <swati.gogia@thoughtworks.com> * BAH-1397 | Refactored. to get all patient Identifiers from openmrs api and fix edit patient functionality Co-authored-by: Swati Gogia <swati.gogia@thoughtworks.com> * BAH-1397 | Refactored. removed unused services and fixed test failures Co-authored-by: Swati Gogia <swati.gogia@thoughtworks.com> * BAH-1397 | Refactored. mapping of address from extension to bahmni Co-authored-by: Swati Gogia <swati.gogia@thoughtworks.com> * Refactor. extension button to be displayed in same line with field value * Refactor. to store identifier in database * Refactored. removed unnecessay files and changes Co-authored-by: Mahesh-I <mahesh.ippili@thoughtworks.com> Co-authored-by: Mahesh Ippili <74229437+Mahesh-I@users.noreply.github.com> Co-authored-by: Shaik Nazeer <nazeer.shaik@thoughtworks.com> Co-authored-by: Nazeer Shaik <75721600+Nazeer-debug@users.noreply.github.com> Co-authored-by: twlalithav <53477735+twlalithav@users.noreply.github.com> Co-authored-by: meghna <meghna.tanwal@thoughworks.com> Co-authored-by: Meghna Tanwal <61121405+MeghnaThoughtworks@users.noreply.github.com> Co-authored-by: Praveena Dayanand <56681033+praveenadayanand@users.noreply.github.com> Co-authored-by: Srilalitha V <lolboch@gmail.com> Co-authored-by: swatigogia2020 <73937345+swatigogia2020@users.noreply.github.com> Co-authored-by: Tazeen Khan <tazeen.khan@thoughtworks.com> Co-authored-by: SreeRanjani14 <77732380+SreeRanjani14@users.noreply.github.com> Co-authored-by: rohit-yawalkar <82825674+rohit-yawalkar@users.noreply.github.com> Co-authored-by: swatigogia2020 <swati.gogia@thoughtworks.com> Co-authored-by: Sanofer Sameera S <sanofersameeras@gmail.com> Co-authored-by: rohit-yawalkar <rohit.yawalkar@thoughtworks.com> * Refactored. removed unnecessay files and changes * reverted input validated changes * BAH-1397 | Refactor. extracted functions and removed duplicate functions BAH-1397 | Refactor. extracted functions and removed duplicate functions BAH-1397 | Refactor. extracted functions and removed duplicate functions * BAH-1397 | Added. test for Extenstion point Co-authored-by: Kavitha S <kavitha.s@thoughtworks.com> Co-authored-by: swatigogia2020 <swati.gogia@thoughtworks.com> * Refactor. removed unwanted spaces and validation * BAH-1397 | removed function specific to extension Co-authored-by: Kavitha S <kavitha.s@thoughtworks.com> Co-authored-by: swatigogia2020 <swati.gogia@thoughtworks.com> * Refactor. boundry condition for patient Identifiers * BAH-1397 | Refactor. renamed function and variables * BAH-1397 | Refactor. renamed variables to be more specific Co-authored-by: praveenadayanand <56681033+praveenadayanand@users.noreply.github.com> Co-authored-by: Praveena Dayanand <praveena.dayanand@thoughtworks.com> Co-authored-by: swatigogia2020 <swati.gogia@thoughtworks.com> Co-authored-by: swatigogia2020 <73937345+swatigogia2020@users.noreply.github.com> Co-authored-by: Mahesh-I <mahesh.ippili@thoughtworks.com> Co-authored-by: Mahesh Ippili <74229437+Mahesh-I@users.noreply.github.com> Co-authored-by: Shaik Nazeer <nazeer.shaik@thoughtworks.com> Co-authored-by: Nazeer Shaik <75721600+Nazeer-debug@users.noreply.github.com> Co-authored-by: twlalithav <53477735+twlalithav@users.noreply.github.com> Co-authored-by: meghna <meghna.tanwal@thoughworks.com> Co-authored-by: Meghna Tanwal <61121405+MeghnaThoughtworks@users.noreply.github.com> Co-authored-by: Srilalitha V <lolboch@gmail.com> Co-authored-by: Tazeen Khan <tazeen.khan@thoughtworks.com> Co-authored-by: SreeRanjani14 <77732380+SreeRanjani14@users.noreply.github.com> Co-authored-by: rohit-yawalkar <82825674+rohit-yawalkar@users.noreply.github.com> Co-authored-by: Sanofer Sameera S <sanofersameeras@gmail.com> Co-authored-by: rohit-yawalkar <rohit.yawalkar@thoughtworks.com> Co-authored-by: Kavitha S <kavitha.s@thoughtworks.com>

Vineela | MOBN-1151 | Fix timeout issue while switching from day view…

2659572

… to week view and viceversa in ot calendar view

kirity-mahanty reviewed Apr 17, 2020

View reviewed changes

shivarach suggested changes Apr 17, 2020

View reviewed changes

venkatavineela force-pushed the ocp-master branch 2 times, most recently from ef32d76 to c15f369 Compare June 10, 2020 12:57

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Vineela | MOBN-1151 | Fix timeout issue while switching from day view… #33

Vineela | MOBN-1151 | Fix timeout issue while switching from day view… #33

binduak commented Apr 17, 2020

kirity-mahanty Apr 17, 2020

kirity-mahanty Apr 17, 2020

kirity-mahanty Apr 17, 2020

shivarach Apr 17, 2020

shivarach Apr 17, 2020

Vineela | MOBN-1151 | Fix timeout issue while switching from day view… #33

Are you sure you want to change the base?

Vineela | MOBN-1151 | Fix timeout issue while switching from day view… #33

Conversation

binduak commented Apr 17, 2020

kirity-mahanty Apr 17, 2020

Choose a reason for hiding this comment

kirity-mahanty Apr 17, 2020

Choose a reason for hiding this comment

kirity-mahanty Apr 17, 2020

Choose a reason for hiding this comment

shivarach Apr 17, 2020

Choose a reason for hiding this comment

shivarach Apr 17, 2020

Choose a reason for hiding this comment