diff --git a/ui/app/appointments/controllers/manage/allAppointmentsController.js b/ui/app/appointments/controllers/manage/allAppointmentsController.js index 2786a03042..bacada2943 100644 --- a/ui/app/appointments/controllers/manage/allAppointmentsController.js +++ b/ui/app/appointments/controllers/manage/allAppointmentsController.js @@ -8,9 +8,6 @@ angular.module('bahmni.appointments') $scope.manageAppointmentPrivilege = Bahmni.Appointments.Constants.privilegeManageAppointments; $scope.navigateTo = function (viewName) { - if ($scope.getCurrentAppointmentTabName() === "list") { - $rootScope.$emit("PopulateInfoForNextAppointment", {}); - } $scope.currentTab = viewName; var path = 'home.manage.appointments.' + viewName; $state.params.appointmentsData = $rootScope.appointmentsData; diff --git a/ui/app/appointments/controllers/manage/appointmentsCreateController.js b/ui/app/appointments/controllers/manage/appointmentsCreateController.js index 7d46b46cca..e9fba0cd8e 100644 --- a/ui/app/appointments/controllers/manage/appointmentsCreateController.js +++ b/ui/app/appointments/controllers/manage/appointmentsCreateController.js @@ -39,7 +39,6 @@ angular.module('bahmni.appointments') $scope.appointment = Bahmni.Appointments.AppointmentViewModel.create(appointmentContext.appointment || { appointmentKind: 'Scheduled' }, appointmentCreateConfig); $scope.selectedService = appointmentCreateConfig.selectedService; $scope.isPastAppointment = $scope.isEditMode() ? Bahmni.Common.Util.DateUtil.isBeforeDate($scope.appointment.date, moment().startOf('day')) : false; - $scope.appointment.patient = $scope.patientInfo || null; if ($scope.appointment.patient) { $scope.onSelectPatient($scope.appointment.patient); } diff --git a/ui/app/appointments/controllers/manage/list/appointmentsListViewController.js b/ui/app/appointments/controllers/manage/list/appointmentsListViewController.js index a1f855e5fa..70497b71e3 100644 --- a/ui/app/appointments/controllers/manage/list/appointmentsListViewController.js +++ b/ui/app/appointments/controllers/manage/list/appointmentsListViewController.js @@ -242,18 +242,5 @@ angular.module('bahmni.appointments') var allowedActions = $scope.allowedActionsByStatus.hasOwnProperty(status) ? $scope.allowedActionsByStatus[status] : []; return _.includes(allowedActions, action); }; - var parsePatient = function (patientInfo) { - var patient = {}; - patient.label = patientInfo.name + " (" + patientInfo.identifier + ")"; - patient.uuid = patientInfo.uuid; - return patient; - }; - // $rootScope.$on("PopulateInfoForNextAppointment", function () { - // if ($scope.getCurrentAppointmentTabName() === "list") { - // var patient = {}; - // patient.label = $scope.selectedPatientlabel; - // return; - // } - // }); init(); }]); diff --git a/ui/app/appointments/views/manage/newAppointment.html b/ui/app/appointments/views/manage/newAppointment.html index 1ecb6235ba..b31d746e4e 100644 --- a/ui/app/appointments/views/manage/newAppointment.html +++ b/ui/app/appointments/views/manage/newAppointment.html @@ -19,7 +19,6 @@