fixed minor login bug

muskankhedia · Feb 2, 2020 · 0dc3aaf · 0dc3aaf
1 parent b1967fe
commit 0dc3aaf
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 6 deletions.
diff --git a/service/datastore/events.json b/service/datastore/events.json
@@ -0,0 +1 @@
+[{"EventID":0,"PatientID":200,"Event":"jaundice","Medicine":["steroid"],"TimeSFO":12,"Success":false,"Hash":"da3fdf6417fb83a1be0b8372627be6ca37e3394c4be46b908d40447a2909f3e1"},{"EventID":1,"PatientID":1,"Event":"Fever","Medicine":["Paracetamol"],"TimeSFO":23,"Success":true,"Hash":"da3fdf6417fb83a1be0b8372627be6ca37e3394c4be46b908d40447a2909f3e1"}]
diff --git a/service/datastore/profile.json b/service/datastore/profile.json
@@ -1 +1 @@
-[{"patientid":0,"bsugar":85,"asugar":130,"dbp":80,"sbp":120,"bmi":18.5,"temp":93.5,"pulse":72,"resp":15,"gender":"M"},{"patientid":0,"bsugar":80,"asugar":120,"dbp":90,"sbp":110,"bmi":19.5,"temp":90,"pulse":79,"resp":16,"gender":"F"},{"patientid":1,"bsugar":80,"asugar":120,"dbp":80,"sbp":120,"bmi":22,"temp":97,"pulse":72,"resp":18,"gender":"male"},{"patientid":1,"bsugar":80,"asugar":120,"dbp":80,"sbp":12,"bmi":22,"temp":97,"pulse":72,"resp":18,"gender":"male"},{"patientid":1,"bsugar":80,"asugar":120,"dbp":80,"sbp":12,"bmi":22,"temp":97,"pulse":72,"resp":18,"gender":"female"},{"patientid":1,"bsugar":80,"asugar":120,"dbp":80,"sbp":12,"bmi":22,"temp":97,"pulse":72,"resp":18,"gender":"male"},{"patientid":1,"bsugar":80,"asugar":120,"dbp":80,"sbp":12,"bmi":22,"temp":97,"pulse":72,"resp":18,"gender":"female"},{"patientid":0,"bsugar":80,"asugar":120,"dbp":90,"sbp":110,"bmi":19.5,"temp":90,"pulse":79,"resp":16,"gender":"F"},{"patientid":1,"bsugar":40,"asugar":120,"dbp":80,"sbp":12,"bmi":22,"temp":97,"pulse":72,"resp":18,"gender":"female"},{"patientid":1,"bsugar":110,"asugar":130,"dbp":80,"sbp":12,"bmi":22,"temp":97,"pulse":72,"resp":18,"gender":"female"},{"patientid":1,"bsugar":120,"asugar":120,"dbp":80,"sbp":12,"bmi":22,"temp":97,"pulse":72,"resp":12,"gender":"M"}]
+[{"patientid":1,"bsugar":23,"asugar":34,"dbp":2,"sbp":2,"bmi":2,"temp":2,"pulse":2,"resp":2,"gender":"F"}]
diff --git a/service/datastore/users.json b/service/datastore/users.json
@@ -1 +1 @@
-[{"PatientID":0,"Name":"Test","Email":"[email protected]","Age":"21","Dob":"01/04/1999","BloodGroup":"A+","BirthType":"Normal"},{"PatientID":2,"Name":"dffg","Email":"fd@sfs","Age":"12","Dob":"Fri Aug 09 2019 00:00:00 GMT 0530 (India Standard Time)","BloodGroup":"1212","BirthType":"213"},{"PatientID":3,"Name":"dffg","Email":"fd@sfs","Age":"12","Dob":"Fri Aug 09 2019 00:00:00 GMT 0530 (India Standard Time)","BloodGroup":"1212","BirthType":"213"},{"PatientID":4,"Name":"dffg","Email":"fd@sfs","Age":"12","Dob":"Fri Aug 09 2019 00:00:00 GMT 0530 (India Standard Time)","BloodGroup":"1212","BirthType":"213"},{"PatientID":5,"Name":"dffg","Email":"fd@sfs","Age":"12","Dob":"Fri Aug 09 2019 00:00:00 GMT 0530 (India Standard Time)","BloodGroup":"1212","BirthType":"213"},{"PatientID":6,"Name":"tryrt","Email":"errg@g","Age":"45","Dob":"Fri Aug 09 2019 00:00:00 GMT 0530 (India Standard Time)","BloodGroup":"45","BirthType":"45"},{"PatientID":7,"Name":"tryrt","Email":"errg@g","Age":"45","Dob":"Fri Aug 09 2019 00:00:00 GMT 0530 (India Standard Time)","BloodGroup":"45","BirthType":"45"},{"PatientID":8,"Name":"tryrt","Email":"errg@g","Age":"45","Dob":"Fri Aug 09 2019 00:00:00 GMT 0530 (India Standard Time)","BloodGroup":"45","BirthType":"45"},{"PatientID":9,"Name":"fgh","Email":"fhf@gg","Age":"34","Dob":"Thu Aug 15 2019 00:00:00 GMT 0530 (India Standard Time)","BloodGroup":"d","BirthType":"gdf"},{"PatientID":10,"Name":"fgh","Email":"fhf@gg","Age":"34","Dob":"Thu Aug 15 2019 00:00:00 GMT 0530 (India Standard Time)","BloodGroup":"d","BirthType":"gdf"},{"PatientID":11,"Name":"fgh","Email":"fhf@gg","Age":"34","Dob":"Thu Aug 15 2019 00:00:00 GMT 0530 (India Standard Time)","BloodGroup":"d","BirthType":"gdf"},{"PatientID":12,"Name":"fgh","Email":"fhf@gg","Age":"34","Dob":"Thu Aug 15 2019 00:00:00 GMT 0530 (India Standard Time)","BloodGroup":"d","BirthType":"gdf"},{"PatientID":13,"Name":"fgh","Email":"fhf@gg","Age":"34","Dob":"Thu Aug 15 2019 00:00:00 GMT 0530 (India Standard Time)","BloodGroup":"d","BirthType":"gdf"},{"PatientID":14,"Name":"fgh","Email":"fhf@gg","Age":"34","Dob":"Thu Aug 15 2019 00:00:00 GMT 0530 (India Standard Time)","BloodGroup":"d","BirthType":"gdf"},{"PatientID":15,"Name":"fgh","Email":"fhf@gg","Age":"34","Dob":"Thu Aug 15 2019 00:00:00 GMT 0530 (India Standard Time)","BloodGroup":"d","BirthType":"gdf"},{"PatientID":16,"Name":"fgh","Email":"fhf@gg","Age":"34","Dob":"Thu Aug 15 2019 00:00:00 GMT 0530 (India Standard Time)","BloodGroup":"d","BirthType":"gdf"},{"PatientID":17,"Name":"fgh","Email":"fhf@gg","Age":"34","Dob":"Thu Aug 15 2019 00:00:00 GMT 0530 (India Standard Time)","BloodGroup":"d","BirthType":"gdf"},{"PatientID":18,"Name":"fgh","Email":"fhf@gg","Age":"34","Dob":"Thu Aug 15 2019 00:00:00 GMT 0530 (India Standard Time)","BloodGroup":"d","BirthType":"gdf"},{"PatientID":19,"Name":"fgh","Email":"fhf@gg","Age":"34","Dob":"Thu Aug 15 2019 00:00:00 GMT 0530 (India Standard Time)","BloodGroup":"d","BirthType":"gdf"},{"PatientID":20,"Name":"fgh","Email":"fhf@gg","Age":"34","Dob":"Thu Aug 15 2019 00:00:00 GMT 0530 (India Standard Time)","BloodGroup":"d","BirthType":"gdf"},{"PatientID":21,"Name":"fgh","Email":"fhf@gg","Age":"34","Dob":"Thu Aug 15 2019 00:00:00 GMT 0530 (India Standard Time)","BloodGroup":"d","BirthType":"gdf"},{"PatientID":22,"Name":"fgh","Email":"fhf@gg","Age":"34","Dob":"Thu Aug 15 2019 00:00:00 GMT 0530 (India Standard Time)","BloodGroup":"d","BirthType":"gdf"},{"PatientID":23,"Name":"fgh","Email":"fhf@gg","Age":"34","Dob":"Thu Aug 15 2019 00:00:00 GMT 0530 (India Standard Time)","BloodGroup":"d","BirthType":"gdf"},{"PatientID":24,"Name":"dgdf","Email":"dfg@fgdf","Age":"23","Dob":"Thu Aug 01 2019 00:00:00 GMT 0530 (India Standard Time)","BloodGroup":"er","BirthType":"ret"},{"PatientID":25,"Name":"fgd","Email":"undefined","Age":"234","Dob":"Thu Aug 08 2019 00:00:00 GMT 0530 (India Standard Time)","BloodGroup":"dfs","BirthType":"sdfg"},{"PatientID":26,"Name":"fgd","Email":"dfg@fd","Age":"234","Dob":"Thu Aug 08 2019 00:00:00 GMT 0530 (India Standard Time)","BloodGroup":"dfs","BirthType":"sdfg"},{"PatientID":27,"Name":"gdfg","Email":"dfg@sgdf","Age":"42","Dob":"Fri Aug 23 2019 00:00:00 GMT 0530 (India Standard Time)","BloodGroup":"dfg","BirthType":"fg"},{"PatientID":28,"Name":"fhfgh","Email":"fhfg@dfgdf","Age":"45","Dob":"Fri Aug 09 2019 00:00:00 GMT 0530 (India Standard Time)","BloodGroup":"o ","BirthType":"dfg"},{"PatientID":29,"Name":"dfsf","Email":"ffgg@sdgs","Age":"11","Dob":"Thu Aug 08 2019 00:00:00 GMT 0530 (India Standard Time)","BloodGroup":"fgd","BirthType":"dfg"},{"PatientID":30,"Name":"Amit","Email":"[email protected]","Age":"23","Dob":"Thu Feb 03 1994 00:00:00 GMT 0530 (India Standard Time)","BloodGroup":"B ","BirthType":"Normal"}]
+[{"PatientID":1,"Name":"Muskan Khedia","Email":"[email protected]","Age":"78","Dob":"Sat Feb 01 2020 00:00:00 GMT 0530 (India Standard Time)","BloodGroup":"AB ","BirthType":"C"}]
diff --git a/ui/app.js b/ui/app.js
@@ -112,7 +112,7 @@ app.controller('primaryController', function($scope, $location, $rootScope, $htt
         }).then(resp => {
             let res = resp.data;
             console.log('res is ', res)
-            if (res) {
+            if (res === 'true'){
                 console.warn('was', $scope.patientid)
                 global.patientid = $scope.patientid;
                 $location.path('/home');

diff --git a/ui/html_components/login.html b/ui/html_components/login.html
@@ -19,10 +19,10 @@ <h3 class="panel-title">Log In</h3>
                     <button type="submit" class="btn btn-success" data-ng-click="handleLogin()" >Submit</button> &nbsp;
                     <a href="/?#!/signUp"><button type="button" class="btn btn-primary" >Sign Up</button></a>
 
-                    <div data-ng-if="showLoader">
+                    <!-- <div data-ng-if="showLoader">
                         <div class="loader"></div>
                         <img src="../loader.gif" alt="" style="height:100px;margin-left: 3%;margin-top: 10px;">
-                    </div>
+                    </div> -->
                     {{wrongpass}}
                 </form>
             </div>

diff --git a/ui/html_components/sidebar.html b/ui/html_components/sidebar.html
@@ -1,5 +1,5 @@
 <div class="sidebar-menu tree" style="width: 200px;height: 100%; background-color: #fafafa;" >
-    <img src="../admin.png" alt="" style="height:100px;margin-left: 25%;margin-top: 10%;" >
+    <!-- <img src="../admin.png" alt="" style="height:100px;margin-left: 25%;margin-top: 10%;" > -->
     <ul style="list-style: none;padding-top: 5%;padding-left: 0%;">
             <a href="/?#!/home" class="lists"><li class="lists" style="border-top: 1px solid #0E6363;">Home</li></a>
             <a href="/?#!/events" class="lists"><li class="lists">Update Records</li></a>
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		[{"EventID":0,"PatientID":200,"Event":"jaundice","Medicine":["steroid"],"TimeSFO":12,"Success":false,"Hash":"da3fdf6417fb83a1be0b8372627be6ca37e3394c4be46b908d40447a2909f3e1"},{"EventID":1,"PatientID":1,"Event":"Fever","Medicine":["Paracetamol"],"TimeSFO":23,"Success":true,"Hash":"da3fdf6417fb83a1be0b8372627be6ca37e3394c4be46b908d40447a2909f3e1"}]
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		[{"patientid":0,"bsugar":85,"asugar":130,"dbp":80,"sbp":120,"bmi":18.5,"temp":93.5,"pulse":72,"resp":15,"gender":"M"},{"patientid":0,"bsugar":80,"asugar":120,"dbp":90,"sbp":110,"bmi":19.5,"temp":90,"pulse":79,"resp":16,"gender":"F"},{"patientid":1,"bsugar":80,"asugar":120,"dbp":80,"sbp":120,"bmi":22,"temp":97,"pulse":72,"resp":18,"gender":"male"},{"patientid":1,"bsugar":80,"asugar":120,"dbp":80,"sbp":12,"bmi":22,"temp":97,"pulse":72,"resp":18,"gender":"male"},{"patientid":1,"bsugar":80,"asugar":120,"dbp":80,"sbp":12,"bmi":22,"temp":97,"pulse":72,"resp":18,"gender":"female"},{"patientid":1,"bsugar":80,"asugar":120,"dbp":80,"sbp":12,"bmi":22,"temp":97,"pulse":72,"resp":18,"gender":"male"},{"patientid":1,"bsugar":80,"asugar":120,"dbp":80,"sbp":12,"bmi":22,"temp":97,"pulse":72,"resp":18,"gender":"female"},{"patientid":0,"bsugar":80,"asugar":120,"dbp":90,"sbp":110,"bmi":19.5,"temp":90,"pulse":79,"resp":16,"gender":"F"},{"patientid":1,"bsugar":40,"asugar":120,"dbp":80,"sbp":12,"bmi":22,"temp":97,"pulse":72,"resp":18,"gender":"female"},{"patientid":1,"bsugar":110,"asugar":130,"dbp":80,"sbp":12,"bmi":22,"temp":97,"pulse":72,"resp":18,"gender":"female"},{"patientid":1,"bsugar":120,"asugar":120,"dbp":80,"sbp":12,"bmi":22,"temp":97,"pulse":72,"resp":12,"gender":"M"}]
		[{"patientid":1,"bsugar":23,"asugar":34,"dbp":2,"sbp":2,"bmi":2,"temp":2,"pulse":2,"resp":2,"gender":"F"}]
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		[{"PatientID":0,"Name":"Test","Email":"[email protected]","Age":"21","Dob":"01/04/1999","BloodGroup":"A+","BirthType":"Normal"},{"PatientID":2,"Name":"dffg","Email":"fd@sfs","Age":"12","Dob":"Fri Aug 09 2019 00:00:00 GMT 0530 (India Standard Time)","BloodGroup":"1212","BirthType":"213"},{"PatientID":3,"Name":"dffg","Email":"fd@sfs","Age":"12","Dob":"Fri Aug 09 2019 00:00:00 GMT 0530 (India Standard Time)","BloodGroup":"1212","BirthType":"213"},{"PatientID":4,"Name":"dffg","Email":"fd@sfs","Age":"12","Dob":"Fri Aug 09 2019 00:00:00 GMT 0530 (India Standard Time)","BloodGroup":"1212","BirthType":"213"},{"PatientID":5,"Name":"dffg","Email":"fd@sfs","Age":"12","Dob":"Fri Aug 09 2019 00:00:00 GMT 0530 (India Standard Time)","BloodGroup":"1212","BirthType":"213"},{"PatientID":6,"Name":"tryrt","Email":"errg@g","Age":"45","Dob":"Fri Aug 09 2019 00:00:00 GMT 0530 (India Standard Time)","BloodGroup":"45","BirthType":"45"},{"PatientID":7,"Name":"tryrt","Email":"errg@g","Age":"45","Dob":"Fri Aug 09 2019 00:00:00 GMT 0530 (India Standard Time)","BloodGroup":"45","BirthType":"45"},{"PatientID":8,"Name":"tryrt","Email":"errg@g","Age":"45","Dob":"Fri Aug 09 2019 00:00:00 GMT 0530 (India Standard Time)","BloodGroup":"45","BirthType":"45"},{"PatientID":9,"Name":"fgh","Email":"fhf@gg","Age":"34","Dob":"Thu Aug 15 2019 00:00:00 GMT 0530 (India Standard Time)","BloodGroup":"d","BirthType":"gdf"},{"PatientID":10,"Name":"fgh","Email":"fhf@gg","Age":"34","Dob":"Thu Aug 15 2019 00:00:00 GMT 0530 (India Standard Time)","BloodGroup":"d","BirthType":"gdf"},{"PatientID":11,"Name":"fgh","Email":"fhf@gg","Age":"34","Dob":"Thu Aug 15 2019 00:00:00 GMT 0530 (India Standard Time)","BloodGroup":"d","BirthType":"gdf"},{"PatientID":12,"Name":"fgh","Email":"fhf@gg","Age":"34","Dob":"Thu Aug 15 2019 00:00:00 GMT 0530 (India Standard Time)","BloodGroup":"d","BirthType":"gdf"},{"PatientID":13,"Name":"fgh","Email":"fhf@gg","Age":"34","Dob":"Thu Aug 15 2019 00:00:00 GMT 0530 (India Standard Time)","BloodGroup":"d","BirthType":"gdf"},{"PatientID":14,"Name":"fgh","Email":"fhf@gg","Age":"34","Dob":"Thu Aug 15 2019 00:00:00 GMT 0530 (India Standard Time)","BloodGroup":"d","BirthType":"gdf"},{"PatientID":15,"Name":"fgh","Email":"fhf@gg","Age":"34","Dob":"Thu Aug 15 2019 00:00:00 GMT 0530 (India Standard Time)","BloodGroup":"d","BirthType":"gdf"},{"PatientID":16,"Name":"fgh","Email":"fhf@gg","Age":"34","Dob":"Thu Aug 15 2019 00:00:00 GMT 0530 (India Standard Time)","BloodGroup":"d","BirthType":"gdf"},{"PatientID":17,"Name":"fgh","Email":"fhf@gg","Age":"34","Dob":"Thu Aug 15 2019 00:00:00 GMT 0530 (India Standard Time)","BloodGroup":"d","BirthType":"gdf"},{"PatientID":18,"Name":"fgh","Email":"fhf@gg","Age":"34","Dob":"Thu Aug 15 2019 00:00:00 GMT 0530 (India Standard Time)","BloodGroup":"d","BirthType":"gdf"},{"PatientID":19,"Name":"fgh","Email":"fhf@gg","Age":"34","Dob":"Thu Aug 15 2019 00:00:00 GMT 0530 (India Standard Time)","BloodGroup":"d","BirthType":"gdf"},{"PatientID":20,"Name":"fgh","Email":"fhf@gg","Age":"34","Dob":"Thu Aug 15 2019 00:00:00 GMT 0530 (India Standard Time)","BloodGroup":"d","BirthType":"gdf"},{"PatientID":21,"Name":"fgh","Email":"fhf@gg","Age":"34","Dob":"Thu Aug 15 2019 00:00:00 GMT 0530 (India Standard Time)","BloodGroup":"d","BirthType":"gdf"},{"PatientID":22,"Name":"fgh","Email":"fhf@gg","Age":"34","Dob":"Thu Aug 15 2019 00:00:00 GMT 0530 (India Standard Time)","BloodGroup":"d","BirthType":"gdf"},{"PatientID":23,"Name":"fgh","Email":"fhf@gg","Age":"34","Dob":"Thu Aug 15 2019 00:00:00 GMT 0530 (India Standard Time)","BloodGroup":"d","BirthType":"gdf"},{"PatientID":24,"Name":"dgdf","Email":"dfg@fgdf","Age":"23","Dob":"Thu Aug 01 2019 00:00:00 GMT 0530 (India Standard Time)","BloodGroup":"er","BirthType":"ret"},{"PatientID":25,"Name":"fgd","Email":"undefined","Age":"234","Dob":"Thu Aug 08 2019 00:00:00 GMT 0530 (India Standard Time)","BloodGroup":"dfs","BirthType":"sdfg"},{"PatientID":26,"Name":"fgd","Email":"dfg@fd","Age":"234","Dob":"Thu Aug 08 2019 00:00:00 GMT 0530 (India Standard Time)","BloodGroup":"dfs","BirthType":"sdfg"},{"PatientID":27,"Name":"gdfg","Email":"dfg@sgdf","Age":"42","Dob":"Fri Aug 23 2019 00:00:00 GMT 0530 (India Standard Time)","BloodGroup":"dfg","BirthType":"fg"},{"PatientID":28,"Name":"fhfgh","Email":"fhfg@dfgdf","Age":"45","Dob":"Fri Aug 09 2019 00:00:00 GMT 0530 (India Standard Time)","BloodGroup":"o ","BirthType":"dfg"},{"PatientID":29,"Name":"dfsf","Email":"ffgg@sdgs","Age":"11","Dob":"Thu Aug 08 2019 00:00:00 GMT 0530 (India Standard Time)","BloodGroup":"fgd","BirthType":"dfg"},{"PatientID":30,"Name":"Amit","Email":"[email protected]","Age":"23","Dob":"Thu Feb 03 1994 00:00:00 GMT 0530 (India Standard Time)","BloodGroup":"B ","BirthType":"Normal"}]
		[{"PatientID":1,"Name":"Muskan Khedia","Email":"[email protected]","Age":"78","Dob":"Sat Feb 01 2020 00:00:00 GMT 0530 (India Standard Time)","BloodGroup":"AB ","BirthType":"C"}]