diff --git a/.github/counter.txt b/.github/counter.txt index 7ed6ff82de..0cfbf08886 100644 --- a/.github/counter.txt +++ b/.github/counter.txt @@ -1 +1 @@ -5 +2 diff --git a/.github/last_date.txt b/.github/last_date.txt index 613753ee8b..a844618aff 100644 --- a/.github/last_date.txt +++ b/.github/last_date.txt @@ -1 +1 @@ -20240803 +20240807 \ No newline at end of file diff --git a/README.md b/README.md index 556dce7e60..0cc0cf7075 100644 --- a/README.md +++ b/README.md @@ -18,11 +18,7 @@ Developed using Java Enterprise Edition, the system offers both a web applicatio ## Current Version - - -Current Version: 3.0.0.20240803.5 (This line will be automatically updated to reflect the latest version) - - +Current Version: 3.0.0.20240807.2 (This line will be automatically updated to reflect the latest version) ## History @@ -77,7 +73,7 @@ The features available to different roles of the users are stated in detail in t * Dr M H B Ariyaratne - Initiated the Project, Product owner, System Architect, Lead Developer since 2004 to date ## Project Management -* Mr.K.M.G.T.R. Waidyarathne - Project Management from 2013 to date +* Mr.K.M.G.T.R. Waidyarathne - Recruitment Management from 2013 to 2022, Project Management from 2022 to 2024 ## Business Analyst * Miss Binuthi Nilakna Ariyaratne - From 2024 to date diff --git a/nb-configuration.xml b/nb-configuration.xml index 9388aa5962..9554059008 100644 --- a/nb-configuration.xml +++ b/nb-configuration.xml @@ -1,22 +1,15 @@ - + + + false + + - ide none false - pfv5ee8 + Facelets diff --git a/pom.xml b/pom.xml index 231feeeb13..467b012a4c 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 com.divudi - sethmademo + ruhunu 3.0.0 war ruhunu diff --git a/src/main/java/com/divudi/bean/cashTransaction/PaymentController.java b/src/main/java/com/divudi/bean/cashTransaction/PaymentController.java index e3da8ccf16..453a496953 100644 --- a/src/main/java/com/divudi/bean/cashTransaction/PaymentController.java +++ b/src/main/java/com/divudi/bean/cashTransaction/PaymentController.java @@ -10,14 +10,10 @@ import com.divudi.bean.common.*; import com.divudi.entity.Payment; -import com.divudi.entity.Institution; import com.divudi.facade.PaymentFacade; import java.io.Serializable; -import java.util.ArrayList; import java.util.Date; -import java.util.HashMap; import java.util.List; -import java.util.Map; import javax.ejb.EJB; import javax.enterprise.context.SessionScoped; import javax.faces.component.UIComponent; diff --git a/src/main/java/com/divudi/bean/channel/AppointmentActivityController.java b/src/main/java/com/divudi/bean/channel/AppointmentActivityController.java index 6173282d77..82f1acf2d6 100644 --- a/src/main/java/com/divudi/bean/channel/AppointmentActivityController.java +++ b/src/main/java/com/divudi/bean/channel/AppointmentActivityController.java @@ -10,11 +10,7 @@ import com.divudi.bean.common.*; import com.divudi.bean.common.util.JsfUtil; -import com.divudi.data.FeeType; -import com.divudi.data.PaymentMethod; -import com.divudi.data.channel.ChannelScheduleEvent; import com.divudi.ejb.ChannelBean; -import com.divudi.entity.ServiceSession; import com.divudi.entity.Staff; import com.divudi.entity.channel.AppointmentActivity; import com.divudi.entity.channel.SessionInstance; @@ -22,7 +18,6 @@ import com.divudi.facade.ServiceSessionFacade; import com.divudi.facade.SessionInstanceFacade; import com.divudi.facade.StaffFacade; -import com.divudi.java.CommonFunctions; import java.io.Serializable; import java.util.ArrayList; import java.util.Date; @@ -37,7 +32,6 @@ import javax.faces.convert.FacesConverter; import javax.inject.Inject; import javax.inject.Named; -import org.primefaces.model.DefaultScheduleModel; import org.primefaces.model.ScheduleModel; /** diff --git a/src/main/java/com/divudi/bean/channel/BillSessionController.java b/src/main/java/com/divudi/bean/channel/BillSessionController.java index 243bad4031..7f69b40eab 100644 --- a/src/main/java/com/divudi/bean/channel/BillSessionController.java +++ b/src/main/java/com/divudi/bean/channel/BillSessionController.java @@ -10,9 +10,7 @@ import com.divudi.bean.common.*; import com.divudi.entity.BillSession; -import com.divudi.entity.channel.SessionInstance; import com.divudi.facade.BillSessionFacade; -import com.divudi.facade.SessionInstanceFacade; import java.io.Serializable; import java.util.List; import javax.ejb.EJB; diff --git a/src/main/java/com/divudi/bean/channel/BookingController.java b/src/main/java/com/divudi/bean/channel/BookingController.java index 668e84b8c1..01dfe7bf64 100644 --- a/src/main/java/com/divudi/bean/channel/BookingController.java +++ b/src/main/java/com/divudi/bean/channel/BookingController.java @@ -72,13 +72,11 @@ import com.divudi.data.BillFinanceType; import com.divudi.data.BillTypeAtomic; import com.divudi.data.OptionScope; -import com.divudi.data.SmsSentResponse; import com.divudi.data.dataStructure.ComponentDetail; import com.divudi.entity.Fee; import com.divudi.entity.Payment; import com.divudi.entity.channel.AppointmentActivity; import com.divudi.entity.channel.SessionInstanceActivity; -import com.divudi.entity.lab.ItemForItem; import com.divudi.facade.PaymentFacade; import com.divudi.facade.SessionInstanceFacade; import com.divudi.java.CommonFunctions; diff --git a/src/main/java/com/divudi/bean/channel/BookingControllerViewScope.java b/src/main/java/com/divudi/bean/channel/BookingControllerViewScope.java index 50eb9478d4..e0ccc595cf 100644 --- a/src/main/java/com/divudi/bean/channel/BookingControllerViewScope.java +++ b/src/main/java/com/divudi/bean/channel/BookingControllerViewScope.java @@ -80,7 +80,6 @@ import com.divudi.ejb.StaffBean; import com.divudi.entity.Category; import com.divudi.entity.Doctor; -import com.divudi.entity.Fee; import com.divudi.entity.Payment; import com.divudi.entity.UserPreference; import com.divudi.entity.channel.AgentReferenceBook; diff --git a/src/main/java/com/divudi/bean/channel/BookingControllerViewScopeMonth.java b/src/main/java/com/divudi/bean/channel/BookingControllerViewScopeMonth.java index d3ce5f7c16..29504dde0b 100644 --- a/src/main/java/com/divudi/bean/channel/BookingControllerViewScopeMonth.java +++ b/src/main/java/com/divudi/bean/channel/BookingControllerViewScopeMonth.java @@ -10,8 +10,6 @@ import com.divudi.bean.common.CommonController; import com.divudi.bean.common.ConfigOptionApplicationController; import com.divudi.bean.common.ConfigOptionController; -import com.divudi.bean.common.ControllerWithMultiplePayments; -import com.divudi.bean.common.ControllerWithPatientViewScope; import com.divudi.bean.common.DoctorSpecialityController; import com.divudi.bean.common.ItemForItemController; import com.divudi.bean.common.PriceMatrixController; @@ -30,7 +28,6 @@ import com.divudi.data.channel.ChannelScheduleEvent; import com.divudi.data.dataStructure.PaymentMethodData; import com.divudi.ejb.BillNumberGenerator; -import com.divudi.ejb.ChannelBean; import com.divudi.ejb.ServiceSessionBean; import com.divudi.ejb.SmsManagerEjb; import com.divudi.entity.AgentHistory; @@ -79,7 +76,6 @@ import com.divudi.data.dataStructure.ComponentDetail; import com.divudi.ejb.StaffBean; import com.divudi.entity.Doctor; -import com.divudi.entity.Fee; import com.divudi.entity.Payment; import com.divudi.entity.UserPreference; import com.divudi.entity.channel.AgentReferenceBook; diff --git a/src/main/java/com/divudi/bean/channel/BookingPastController.java b/src/main/java/com/divudi/bean/channel/BookingPastController.java index b23b29e045..b48ab2ce17 100644 --- a/src/main/java/com/divudi/bean/channel/BookingPastController.java +++ b/src/main/java/com/divudi/bean/channel/BookingPastController.java @@ -37,7 +37,6 @@ import java.io.Serializable; import java.util.ArrayList; import java.util.Arrays; -import java.util.Calendar; import java.util.Date; import java.util.HashMap; import java.util.List; @@ -47,7 +46,6 @@ import javax.inject.Inject; import javax.inject.Named; import javax.persistence.TemporalType; -import org.primefaces.event.SelectEvent; /** * diff --git a/src/main/java/com/divudi/bean/channel/ChannelReportTemplateController.java b/src/main/java/com/divudi/bean/channel/ChannelReportTemplateController.java index 3897065333..6899f9d92a 100644 --- a/src/main/java/com/divudi/bean/channel/ChannelReportTemplateController.java +++ b/src/main/java/com/divudi/bean/channel/ChannelReportTemplateController.java @@ -77,7 +77,6 @@ import javax.inject.Inject; import javax.inject.Named; import javax.persistence.TemporalType; -import org.hl7.fhir.r5.model.Bundle; @Named @SessionScoped diff --git a/src/main/java/com/divudi/bean/channel/ChannelScheduleController.java b/src/main/java/com/divudi/bean/channel/ChannelScheduleController.java index 3de5c9567a..86231495e9 100644 --- a/src/main/java/com/divudi/bean/channel/ChannelScheduleController.java +++ b/src/main/java/com/divudi/bean/channel/ChannelScheduleController.java @@ -14,7 +14,6 @@ import com.divudi.data.FeeChangeType; import com.divudi.data.FeeType; -import com.divudi.data.PersonInstitutionType; import com.divudi.entity.BillSession; import com.divudi.entity.Department; import com.divudi.entity.FeeChange; @@ -34,7 +33,6 @@ import com.divudi.data.BillType; import com.divudi.data.MessageType; import com.divudi.data.OptionScope; -import com.divudi.data.SmsSentResponse; import com.divudi.data.channel.ChannelScheduleEvent; import com.divudi.ejb.ChannelBean; import com.divudi.ejb.SmsManagerEjb; @@ -42,14 +40,12 @@ import com.divudi.entity.BilledBill; import com.divudi.entity.DoctorSpeciality; import com.divudi.entity.Item; -import com.divudi.entity.ServiceSessionInstance; import com.divudi.entity.Sms; import com.divudi.entity.channel.SessionInstance; import com.divudi.entity.lab.ItemForItem; import com.divudi.facade.BillSessionFacade; import com.divudi.facade.DoctorSpecialityFacade; import com.divudi.facade.ItemForItemFacade; -import com.divudi.facade.ServiceSessionInstanceFacade; import com.divudi.facade.SessionInstanceFacade; import com.divudi.facade.SmsFacade; import com.divudi.java.CommonFunctions; @@ -64,10 +60,8 @@ import java.util.Map; import javax.ejb.EJB; import javax.enterprise.context.SessionScoped; -import javax.faces.annotation.FacesConfig; import javax.inject.Inject; import javax.inject.Named; -import javax.mail.Session; import javax.persistence.TemporalType; import org.primefaces.model.DefaultScheduleModel; import org.primefaces.model.ScheduleModel; diff --git a/src/main/java/com/divudi/bean/channel/ChannelStaffPaymentBillController.java b/src/main/java/com/divudi/bean/channel/ChannelStaffPaymentBillController.java index c47378ef0d..e51a5b84f8 100644 --- a/src/main/java/com/divudi/bean/channel/ChannelStaffPaymentBillController.java +++ b/src/main/java/com/divudi/bean/channel/ChannelStaffPaymentBillController.java @@ -15,7 +15,6 @@ import com.divudi.ejb.BillNumberGenerator; import com.divudi.ejb.SmsManagerEjb; import com.divudi.entity.Sms; -import com.divudi.data.SmsSentResponse; import com.divudi.entity.Bill; import com.divudi.entity.BillFee; import com.divudi.entity.BillItem; diff --git a/src/main/java/com/divudi/bean/channel/ChannellingFeeController.java b/src/main/java/com/divudi/bean/channel/ChannellingFeeController.java index 7fb096179f..0bb76c89a1 100644 --- a/src/main/java/com/divudi/bean/channel/ChannellingFeeController.java +++ b/src/main/java/com/divudi/bean/channel/ChannellingFeeController.java @@ -16,7 +16,6 @@ import com.divudi.entity.Item; import com.divudi.entity.ItemFee; import com.divudi.entity.ServiceSession; -import com.divudi.entity.SessionNumberGenerator; import com.divudi.entity.Speciality; import com.divudi.entity.Staff; import com.divudi.facade.DepartmentFacade; diff --git a/src/main/java/com/divudi/bean/channel/PastBookingController.java b/src/main/java/com/divudi/bean/channel/PastBookingController.java index 7e16a4ed7f..d5785b047d 100644 --- a/src/main/java/com/divudi/bean/channel/PastBookingController.java +++ b/src/main/java/com/divudi/bean/channel/PastBookingController.java @@ -6,7 +6,6 @@ import com.divudi.bean.common.BillBeanController; import com.divudi.bean.common.BillController; -import com.divudi.bean.common.CommonController; import com.divudi.bean.common.ConfigOptionApplicationController; import com.divudi.bean.common.ConfigOptionController; import com.divudi.bean.common.ControllerWithPatient; @@ -21,7 +20,6 @@ import com.divudi.data.BillType; import com.divudi.data.FeeType; import com.divudi.data.HistoryType; -import com.divudi.data.MessageType; import com.divudi.data.PaymentMethod; import com.divudi.data.PersonInstitutionType; import com.divudi.data.channel.ChannelScheduleEvent; @@ -46,7 +44,6 @@ import com.divudi.entity.PriceMatrix; import com.divudi.entity.RefundBill; import com.divudi.entity.ServiceSession; -import com.divudi.entity.Sms; import com.divudi.entity.Speciality; import com.divudi.entity.Staff; import com.divudi.entity.channel.ArrivalRecord; @@ -68,12 +65,9 @@ import com.divudi.facade.StaffFacade; import com.divudi.bean.common.util.JsfUtil; import com.divudi.data.BillTypeAtomic; -import com.divudi.data.OptionScope; -import com.divudi.data.SmsSentResponse; import com.divudi.data.dataStructure.ComponentDetail; import com.divudi.entity.Fee; import com.divudi.entity.Payment; -import com.divudi.entity.lab.ItemForItem; import com.divudi.facade.PaymentFacade; import com.divudi.facade.SessionInstanceFacade; import com.divudi.java.CommonFunctions; diff --git a/src/main/java/com/divudi/bean/channel/PatientSessionInstanceActivityController.java b/src/main/java/com/divudi/bean/channel/PatientSessionInstanceActivityController.java index 0e5ef43fc8..74b3bd3475 100644 --- a/src/main/java/com/divudi/bean/channel/PatientSessionInstanceActivityController.java +++ b/src/main/java/com/divudi/bean/channel/PatientSessionInstanceActivityController.java @@ -10,7 +10,6 @@ import com.divudi.bean.common.*; import com.divudi.bean.common.util.JsfUtil; import com.divudi.entity.Area; -import com.divudi.entity.Institution; import com.divudi.entity.channel.PatientSessionInstanceActivity; import com.divudi.facade.AreaFacade; import java.io.Serializable; diff --git a/src/main/java/com/divudi/bean/channel/SessionInstanceActivityController.java b/src/main/java/com/divudi/bean/channel/SessionInstanceActivityController.java index 70de901958..2ff2fdcc36 100644 --- a/src/main/java/com/divudi/bean/channel/SessionInstanceActivityController.java +++ b/src/main/java/com/divudi/bean/channel/SessionInstanceActivityController.java @@ -11,7 +11,6 @@ import com.divudi.bean.common.*; import com.divudi.bean.common.util.JsfUtil; import com.divudi.entity.BillSession; -import com.divudi.entity.Institution; import com.divudi.entity.channel.AppointmentActivity; import com.divudi.entity.channel.SessionInstance; import com.divudi.entity.channel.SessionInstanceActivity; diff --git a/src/main/java/com/divudi/bean/channel/analytics/ReportTemplateController.java b/src/main/java/com/divudi/bean/channel/analytics/ReportTemplateController.java index f0e74522c4..2c1245cead 100644 --- a/src/main/java/com/divudi/bean/channel/analytics/ReportTemplateController.java +++ b/src/main/java/com/divudi/bean/channel/analytics/ReportTemplateController.java @@ -10,14 +10,12 @@ import com.divudi.bean.common.*; import com.divudi.bean.common.util.JsfUtil; -import com.divudi.data.AtomicBillTypeTotals; import com.divudi.data.BillTypeAtomic; import com.divudi.data.ReportTemplateRow; import com.divudi.data.ReportTemplateRowBundle; import com.divudi.data.analytics.ReportTemplateColumn; import com.divudi.data.analytics.ReportTemplateFilter; import com.divudi.data.analytics.ReportTemplateType; -import com.divudi.entity.BillFee; import com.divudi.entity.Department; import com.divudi.entity.ReportTemplate; import com.divudi.entity.Institution; @@ -25,7 +23,6 @@ import com.divudi.entity.WebUser; import com.divudi.facade.ReportTemplateFacade; import com.divudi.java.CommonFunctions; -import com.graphbuilder.math.func.CombinFunction; import java.io.Serializable; import java.util.ArrayList; import java.util.Arrays; @@ -33,14 +30,11 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.Objects; -import java.util.stream.Collectors; import javax.ejb.EJB; import javax.enterprise.context.SessionScoped; import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; import javax.faces.convert.Converter; -import javax.faces.convert.FacesConverter; import javax.inject.Inject; import javax.inject.Named; import javax.persistence.TemporalType; diff --git a/src/main/java/com/divudi/bean/clinical/ClinicalEntityController.java b/src/main/java/com/divudi/bean/clinical/ClinicalEntityController.java index 6767442ef9..167aba79e8 100644 --- a/src/main/java/com/divudi/bean/clinical/ClinicalEntityController.java +++ b/src/main/java/com/divudi/bean/clinical/ClinicalEntityController.java @@ -28,11 +28,6 @@ import javax.faces.convert.FacesConverter; import javax.inject.Inject; import javax.inject.Named; -import javax.servlet.http.HttpServletResponse; -import org.apache.poi.ss.usermodel.Row; -import org.apache.poi.ss.usermodel.Sheet; -import org.apache.poi.ss.usermodel.Workbook; -import org.apache.poi.xssf.usermodel.XSSFWorkbook; /** * diff --git a/src/main/java/com/divudi/bean/clinical/ClinicalFindingItemController.java b/src/main/java/com/divudi/bean/clinical/ClinicalFindingItemController.java index d10e7815e9..b17b6c0e2a 100644 --- a/src/main/java/com/divudi/bean/clinical/ClinicalFindingItemController.java +++ b/src/main/java/com/divudi/bean/clinical/ClinicalFindingItemController.java @@ -13,7 +13,6 @@ import com.divudi.entity.clinical.ClinicalEntity; import com.divudi.facade.ClinicalEntityFacade; import java.io.Serializable; -import java.util.ArrayList; import java.util.Date; import java.util.List; import javax.ejb.EJB; diff --git a/src/main/java/com/divudi/bean/clinical/DocumentTemplateController.java b/src/main/java/com/divudi/bean/clinical/DocumentTemplateController.java index 2e0b287a19..e5eade2afa 100644 --- a/src/main/java/com/divudi/bean/clinical/DocumentTemplateController.java +++ b/src/main/java/com/divudi/bean/clinical/DocumentTemplateController.java @@ -2,7 +2,6 @@ import com.divudi.bean.common.SessionController; -import com.divudi.data.SymanticType; import com.divudi.data.clinical.DocumentTemplateType; import com.divudi.entity.WebUser; import com.divudi.entity.clinical.DocumentTemplate; diff --git a/src/main/java/com/divudi/bean/clinical/PatientEncounterController.java b/src/main/java/com/divudi/bean/clinical/PatientEncounterController.java index 130c4b756e..9c5423f507 100644 --- a/src/main/java/com/divudi/bean/clinical/PatientEncounterController.java +++ b/src/main/java/com/divudi/bean/clinical/PatientEncounterController.java @@ -53,13 +53,10 @@ import com.divudi.bean.common.util.JsfUtil; import com.divudi.bean.lab.CommonReportItemController; import com.divudi.bean.lab.PatientReportController; -import com.divudi.ejb.PatientReportBean; -import com.divudi.entity.BillEntry; import com.divudi.entity.BillItem; import com.divudi.entity.lab.PatientReport; import com.divudi.facade.BillItemFacade; import com.divudi.facade.PatientReportFacade; -import com.mysql.cj.util.Util; import java.io.Serializable; import java.text.SimpleDateFormat; import java.util.ArrayList; diff --git a/src/main/java/com/divudi/bean/clinical/SymptomController.java b/src/main/java/com/divudi/bean/clinical/SymptomController.java index 397272c8ca..b32641250f 100644 --- a/src/main/java/com/divudi/bean/clinical/SymptomController.java +++ b/src/main/java/com/divudi/bean/clinical/SymptomController.java @@ -11,7 +11,6 @@ import com.divudi.bean.common.SessionController; import com.divudi.bean.common.util.JsfUtil; import com.divudi.data.SymanticType; -import com.divudi.entity.Vocabulary; import com.divudi.entity.clinical.ClinicalEntity; import com.divudi.facade.ClinicalEntityFacade; import java.io.Serializable; diff --git a/src/main/java/com/divudi/bean/clinical/TreatementController.java b/src/main/java/com/divudi/bean/clinical/TreatementController.java index 60771812b5..c9c21e098f 100644 --- a/src/main/java/com/divudi/bean/clinical/TreatementController.java +++ b/src/main/java/com/divudi/bean/clinical/TreatementController.java @@ -14,7 +14,6 @@ import com.divudi.entity.clinical.ClinicalEntity; import com.divudi.facade.ClinicalEntityFacade; import java.io.Serializable; -import java.util.ArrayList; import java.util.Date; import java.util.HashMap; import java.util.List; diff --git a/src/main/java/com/divudi/bean/clinical/tmp/DocumentService.java b/src/main/java/com/divudi/bean/clinical/tmp/DocumentService.java index 6f9c1a4e8b..f2a0976e33 100644 --- a/src/main/java/com/divudi/bean/clinical/tmp/DocumentService.java +++ b/src/main/java/com/divudi/bean/clinical/tmp/DocumentService.java @@ -4,8 +4,6 @@ */ package com.divudi.bean.clinical.tmp; -import com.divudi.data.Privileges; -import com.divudi.data.dataStructure.PrivilageNode; import javax.inject.Named; import javax.enterprise.context.ApplicationScoped; import org.primefaces.model.CheckboxTreeNode; diff --git a/src/main/java/com/divudi/bean/clinical/tmp/SelectionView.java b/src/main/java/com/divudi/bean/clinical/tmp/SelectionView.java index 714d964e85..bbc687e644 100644 --- a/src/main/java/com/divudi/bean/clinical/tmp/SelectionView.java +++ b/src/main/java/com/divudi/bean/clinical/tmp/SelectionView.java @@ -5,7 +5,6 @@ package com.divudi.bean.clinical.tmp; import javax.inject.Named; -import javax.faces.view.ViewScoped; import java.io.Serializable; import javax.annotation.PostConstruct; import javax.enterprise.context.SessionScoped; diff --git a/src/main/java/com/divudi/bean/collectingCentre/CollectingCentreBillController.java b/src/main/java/com/divudi/bean/collectingCentre/CollectingCentreBillController.java index ce8752a09f..e13cdbeec9 100644 --- a/src/main/java/com/divudi/bean/collectingCentre/CollectingCentreBillController.java +++ b/src/main/java/com/divudi/bean/collectingCentre/CollectingCentreBillController.java @@ -21,7 +21,6 @@ import com.divudi.data.PaymentMethod; import com.divudi.data.Sex; import com.divudi.data.Title; -import com.divudi.data.dataStructure.BillListWithTotals; import com.divudi.data.dataStructure.PaymentMethodData; import com.divudi.data.dataStructure.YearMonthDay; import com.divudi.ejb.BillEjb; @@ -47,7 +46,6 @@ import com.divudi.entity.Patient; import com.divudi.entity.Payment; import com.divudi.entity.PaymentScheme; -import com.divudi.entity.Person; import com.divudi.entity.Staff; import com.divudi.entity.UserPreference; import com.divudi.entity.WebUser; @@ -151,6 +149,8 @@ public class CollectingCentreBillController implements Serializable, ControllerW StaffBean staffBean; @Inject CategoryController categoryController; + @Inject + ConfigOptionApplicationController configOptionApplicationController; /** * Properties */ @@ -1091,14 +1091,15 @@ private boolean errorCheck() { JsfUtil.addErrorMessage("Please select a collecting centre"); return true; } - if (referralId == null || referralId.trim().equals("")) { - JsfUtil.addErrorMessage("Please enter a referrance number"); - return true; + boolean collectingCentreBillingRequiresReferanceNumbers = configOptionApplicationController.getBooleanValueByKey("Collecting Centre Billing Requires Referance Numbers", true); + boolean collectingCentreBillingRequiresCreditBalanceManagement = configOptionApplicationController.getBooleanValueByKey("Collecting Centre Billing Requires Credit Balance Management", true); + + if (collectingCentreBillingRequiresReferanceNumbers) { + if (referralId == null || referralId.trim().equals("")) { + JsfUtil.addErrorMessage("Please enter a referrance number"); + return true; + } } -// else if (collectingCenterReferranceNumberAlreadyUsed(collectingCentre)) { -// JsfUtil.addErrorMessage("Referral number alredy entered"); -// return true; -// } if (getLstBillEntries().isEmpty()) { JsfUtil.addErrorMessage("Please Add tests before billing"); @@ -1112,31 +1113,25 @@ private boolean errorCheck() { } } - ///not wanted -// if ((collectingCentre.getBallance() - Math.abs(feeTotalExceptCcfs)) < 0 - collectingCentre.getStandardCreditLimit()) { -// JsfUtil.addErrorMessage("This bill excees the Collecting Centre Limit"); -// return true; -// } - double awailableBalance = Math.abs(collectingCentre.getBallance() + Math.abs(collectingCentre.getAllowedCredit())); - - if (awailableBalance < Math.abs(feeTotalExceptCcfs)) { - JsfUtil.addErrorMessage("Collecting Centre Balance is Not Enough"); - return true; - } + double awailableBalance = Math.abs(collectingCentre.getBallance() + Math.abs(collectingCentre.getAllowedCredit())); -// if (agentReferenceBookController.numberHasBeenIssuedToTheAgent(getReferralId())) { -// JsfUtil.addErrorMessage("Invaild Reference Number."); -// return true; -// } - if (agentReferenceBookController.agentReferenceNumberIsAlredyUsed(getReferralId(), collectingCentre, BillType.CollectingCentreBill, PaymentMethod.Agent)) { - JsfUtil.addErrorMessage("This Reference Number is alredy Used."); - setReferralId(""); - return true; + if (collectingCentreBillingRequiresCreditBalanceManagement) { + if (awailableBalance < Math.abs(feeTotalExceptCcfs)) { + JsfUtil.addErrorMessage("Collecting Centre Balance is Not Enough"); + return true; + } } - if (!agentReferenceBookController.numberHasBeenIssuedToTheAgent(collectingCentre, getReferralId())) { - JsfUtil.addErrorMessage("This Reference Number is Blocked Or This channel Book is Not Issued."); - return true; + if (collectingCentreBillingRequiresReferanceNumbers) { + if (agentReferenceBookController.agentReferenceNumberIsAlredyUsed(getReferralId(), collectingCentre, BillType.CollectingCentreBill, PaymentMethod.Agent)) { + JsfUtil.addErrorMessage("This Reference Number is alredy Used."); + setReferralId(""); + return true; + } + if (!agentReferenceBookController.numberHasBeenIssuedToTheAgent(collectingCentre, getReferralId())) { + JsfUtil.addErrorMessage("This Reference Number is Blocked Or This channel Book is Not Issued."); + return true; + } } return false; @@ -1535,7 +1530,7 @@ public String navigateToCollectingCenterBillingromCollectingCenterBilling() { setPatient(getPatient()); return "/collecting_centre/bill?faces-redirect=true"; } - + public String navigateToCollectingCenterBillingfromBillPriview() { prepareNewBillKeepingCollectingCenter(); fillAvailableAgentReferanceNumbers(collectingCentre); diff --git a/src/main/java/com/divudi/bean/collectingCentre/CourierController.java b/src/main/java/com/divudi/bean/collectingCentre/CourierController.java new file mode 100644 index 0000000000..36b633f99d --- /dev/null +++ b/src/main/java/com/divudi/bean/collectingCentre/CourierController.java @@ -0,0 +1,52 @@ +package com.divudi.bean.collectingCentre; + +import javax.inject.Named; +import javax.enterprise.context.SessionScoped; +import java.io.Serializable; + +/** + * + * @author Buddhika Ariyaratne + */ +@Named +@SessionScoped +public class CourierController implements Serializable { + + /** + * Creates a new instance of CourierController + */ + public CourierController() { + } + + public String navigateToCourierCollectSamples() { + return "/collecting_centre/courier/collectSamples.xhtml?faces-redirect=true"; + } + + public String navigateToCourierHandoverSamplesToLab() { + return "/collecting_centre/courier/handoverSamplesToLab.xhtml?faces-redirect=true"; + } + + public String navigateToCourierViewReports() { + return "/collecting_centre/courier/viewReports.xhtml?faces-redirect=true"; + } + + public String navigateToCourierIndex() { + return "/collecting_centre/courier/index.xhtml?faces-redirect=true"; + } + + public String navigateToCourierPrintReports() { + return "/collecting_centre/courier/printReports.xhtml?faces-redirect=true"; + } + + public String navigateToCourierViewStatistics() { + return "/collecting_centre/courier/viewStatistics.xhtml?faces-redirect=true"; + } + + public String navigateToCourierViewBillReports() { + return "/collecting_centre/courier/viewBillReports.xhtml?faces-redirect=true"; + } + + public String navigateToCourierViewPaymentReports() { + return "/collecting_centre/courier/viewPaymentReports.xhtml?faces-redirect=true"; + } +} diff --git a/src/main/java/com/divudi/bean/common/AgentPaymentReceiveSearchController.java b/src/main/java/com/divudi/bean/common/AgentPaymentReceiveSearchController.java index d9eea616e9..05e981142c 100644 --- a/src/main/java/com/divudi/bean/common/AgentPaymentReceiveSearchController.java +++ b/src/main/java/com/divudi/bean/common/AgentPaymentReceiveSearchController.java @@ -30,7 +30,6 @@ import com.divudi.facade.RefundBillFacade; import java.io.Serializable; import java.util.ArrayList; -import java.util.Calendar; import java.util.Date; import java.util.List; import javax.ejb.EJB; diff --git a/src/main/java/com/divudi/bean/common/AppointmentController.java b/src/main/java/com/divudi/bean/common/AppointmentController.java index 32c637a7e9..23555106d6 100644 --- a/src/main/java/com/divudi/bean/common/AppointmentController.java +++ b/src/main/java/com/divudi/bean/common/AppointmentController.java @@ -11,7 +11,6 @@ import com.divudi.bean.inward.BhtEditController; import com.divudi.bean.membership.PaymentSchemeController; import com.divudi.data.BillType; -import com.divudi.data.PaymentMethod; import com.divudi.data.Sex; import com.divudi.data.Title; import com.divudi.data.dataStructure.PaymentMethodData; @@ -34,10 +33,7 @@ import com.divudi.bean.common.util.JsfUtil; import com.divudi.java.CommonFunctions; import java.io.Serializable; -import java.util.ArrayList; import java.util.Date; -import java.util.HashMap; -import java.util.List; import javax.ejb.EJB; import javax.enterprise.context.SessionScoped; import javax.faces.component.UIComponent; @@ -46,7 +42,6 @@ import javax.faces.convert.FacesConverter; import javax.inject.Inject; import javax.inject.Named; -import javax.persistence.TemporalType; import org.primefaces.event.TabChangeEvent; /** diff --git a/src/main/java/com/divudi/bean/common/AreaController.java b/src/main/java/com/divudi/bean/common/AreaController.java index d419840b89..8dfd1e2b1a 100644 --- a/src/main/java/com/divudi/bean/common/AreaController.java +++ b/src/main/java/com/divudi/bean/common/AreaController.java @@ -9,7 +9,6 @@ package com.divudi.bean.common; import com.divudi.bean.common.util.JsfUtil; import com.divudi.entity.Area; -import com.divudi.entity.Institution; import com.divudi.facade.AreaFacade; import java.io.Serializable; import java.util.ArrayList; diff --git a/src/main/java/com/divudi/bean/common/BillBeanController.java b/src/main/java/com/divudi/bean/common/BillBeanController.java index b901ba88b3..0b85dbb656 100644 --- a/src/main/java/com/divudi/bean/common/BillBeanController.java +++ b/src/main/java/com/divudi/bean/common/BillBeanController.java @@ -13,7 +13,6 @@ import com.divudi.data.BillTypeAtomic; import com.divudi.data.FeeType; import com.divudi.data.OpdBillingStrategy; -import com.divudi.data.OpdTokenNumberGenerationStrategy; import com.divudi.data.PaymentMethod; import static com.divudi.data.PaymentMethod.Card; import static com.divudi.data.PaymentMethod.Cheque; @@ -52,7 +51,6 @@ import com.divudi.entity.lab.Investigation; import com.divudi.entity.lab.PatientInvestigation; import com.divudi.entity.membership.AllowedPaymentMethod; -import com.divudi.entity.membership.MembershipScheme; import com.divudi.entity.membership.PaymentSchemeDiscount; import com.divudi.facade.AllowedPaymentMethodFacade; import com.divudi.facade.BillComponentFacade; diff --git a/src/main/java/com/divudi/bean/common/BillController.java b/src/main/java/com/divudi/bean/common/BillController.java index 32ed6857e4..4290c03409 100644 --- a/src/main/java/com/divudi/bean/common/BillController.java +++ b/src/main/java/com/divudi/bean/common/BillController.java @@ -43,7 +43,6 @@ import com.divudi.entity.PriceMatrix; import com.divudi.entity.Staff; import com.divudi.entity.WebUser; -import com.divudi.entity.membership.MembershipScheme; import com.divudi.facade.BillComponentFacade; import com.divudi.facade.BillFacade; import com.divudi.facade.BillFeeFacade; @@ -58,19 +57,13 @@ import com.divudi.bean.common.util.JsfUtil; import com.divudi.bean.opd.OpdBillController; import com.divudi.data.BillTypeAtomic; -import com.divudi.data.HistoryType; import com.divudi.data.dataStructure.ComponentDetail; -import com.divudi.data.dataStructure.DailyCash; -import com.divudi.data.dataStructure.SearchKeyword; -import com.divudi.entity.AppEmail; import com.divudi.entity.FamilyMember; import com.divudi.entity.PreBill; import com.divudi.entity.RefundBill; import com.divudi.java.CommonFunctions; import com.divudi.light.common.BillLight; import java.io.Serializable; -import java.io.UnsupportedEncodingException; -import java.net.URLEncoder; import java.text.DecimalFormat; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/main/java/com/divudi/bean/common/BillPackageMedicalController.java b/src/main/java/com/divudi/bean/common/BillPackageMedicalController.java index 477f6a6f2d..079cb9359a 100644 --- a/src/main/java/com/divudi/bean/common/BillPackageMedicalController.java +++ b/src/main/java/com/divudi/bean/common/BillPackageMedicalController.java @@ -62,10 +62,7 @@ import java.util.Set; import javax.ejb.EJB; import javax.enterprise.context.SessionScoped; -import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; -import javax.faces.convert.Converter; -import javax.faces.convert.FacesConverter; import javax.inject.Inject; import javax.inject.Named; import javax.persistence.Temporal; diff --git a/src/main/java/com/divudi/bean/common/BillSearch.java b/src/main/java/com/divudi/bean/common/BillSearch.java index 0be95d9e11..66479f4680 100644 --- a/src/main/java/com/divudi/bean/common/BillSearch.java +++ b/src/main/java/com/divudi/bean/common/BillSearch.java @@ -5,7 +5,6 @@ package com.divudi.bean.common; import com.divudi.bean.channel.ChannelSearchController; -import com.divudi.bean.common.util.JsfUtil; import com.divudi.bean.collectingCentre.CollectingCentreBillController; import com.divudi.bean.lab.PatientInvestigationController; import com.divudi.bean.pharmacy.PharmacyPreSettleController; @@ -24,7 +23,6 @@ import com.divudi.ejb.PharmacyBean; import com.divudi.ejb.StaffBean; import com.divudi.entity.AgentHistory; -import com.divudi.entity.AppEmail; import com.divudi.entity.AuditEvent; import com.divudi.entity.Bill; import com.divudi.entity.BillComponent; @@ -52,8 +50,6 @@ import com.divudi.facade.WebUserFacade; import com.divudi.bean.common.util.JsfUtil; import com.divudi.bean.pharmacy.PharmacyBillSearch; -import com.divudi.data.BillCategory; -import com.divudi.data.BillFinanceType; import com.divudi.data.BillTypeAtomic; import static com.divudi.data.BillTypeAtomic.CHANNEL_BOOKING_WITH_PAYMENT; import static com.divudi.data.BillTypeAtomic.CHANNEL_PAYMENT_FOR_BOOKING_BILL; @@ -74,17 +70,15 @@ import static com.divudi.data.BillTypeAtomic.PROFESSIONAL_PAYMENT_FOR_STAFF_FOR_CHANNELING_SERVICE_SESSION; import static com.divudi.data.BillTypeAtomic.PROFESSIONAL_PAYMENT_FOR_STAFF_FOR_OPD_SERVICES; import static com.divudi.data.BillTypeAtomic.PROFESSIONAL_PAYMENT_FOR_STAFF_FOR_OPD_SERVICES_RETURN; -import com.divudi.data.CountedServiceType; import com.divudi.data.OptionScope; -import com.divudi.data.ServiceType; import com.divudi.entity.Doctor; import com.divudi.facade.FeeFacade; +import com.divudi.facade.PatientFacade; +import com.divudi.facade.StaffFacade; import com.divudi.java.CommonFunctions; import com.divudi.light.common.BillLight; import java.io.Serializable; -import java.io.UnsupportedEncodingException; import java.lang.reflect.InvocationTargetException; -import java.net.URLEncoder; import java.text.DecimalFormat; import java.text.ParseException; import java.text.SimpleDateFormat; @@ -157,6 +151,8 @@ public class BillSearch implements Serializable { private EmailFacade emailFacade; @EJB FeeFacade feeFacade; + @EJB + private StaffFacade staffFacade; /** * Controllers */ @@ -1267,9 +1263,9 @@ public boolean calculateRefundTotalForOpdBill() { double refundingValue = 0; for (BillFee rbf : i.getBillFees()) { - System.out.println("rbf.getFeeValue() name = " + rbf.getFee().getName()); - System.out.println("rbf.getFeeValue() = " + rbf.getFeeValue()); - System.out.println("rbf.getFeeValue() fee = " + rbf.getFee().getFee()); + //System.out.println("rbf.getFeeValue() name = " + rbf.getFee().getName()); + //System.out.println("rbf.getFeeValue() = " + rbf.getFeeValue()); + //System.out.println("rbf.getFeeValue() fee = " + rbf.getFee().getFee()); refundingValue += rbf.getFeeValue(); } i.setNetValue(refundingValue); @@ -1569,6 +1565,13 @@ public String refundOpdBill() { JsfUtil.addErrorMessage("One or more bill Item you are refunding has been already paid to Service Provider. Can not refund again."); return ""; } + + if (paymentMethod == PaymentMethod.Staff) { + if (getBill().getToStaff() == null) { + JsfUtil.addErrorMessage("Can't Select Staff Method"); + return ""; + } + } if (refundingBill.getBillItems() != null) { for (BillItem bi : refundingBill.getBillItems()) { @@ -1602,23 +1605,36 @@ public String refundOpdBill() { Payment p = getOpdPreSettleController().createPaymentForCancellationsAndRefunds(refundingBill, paymentMethod); //TODO: Create Payments for Bill Items - if (getBill().getPaymentMethod() == PaymentMethod.Credit) { - if (getBill().getToStaff() != null) { - staffBean.updateStaffCredit(getBill().getToStaff(), 0 - (getBill().getNetTotal() + getBill().getVat())); - JsfUtil.addSuccessMessage("Staff Credit Updated"); - } else if (getBill().getCreditCompany() != null) { - //TODO : Update Credit COmpany Bill - } + if (getBill().getPaymentMethod() == PaymentMethod.Staff) { + //System.out.println("PaymentMethod - Staff"); + + //System.out.println("Before Balance = " + getBill().getToStaff().getCurrentCreditValue()); + getBill().getToStaff().setCurrentCreditValue(getBill().getToStaff().getCurrentCreditValue() - Math.abs(getRefundingBill().getNetTotal())); + + //System.out.println("After Balance = " + getBill().getToStaff().getCurrentCreditValue()); + staffFacade.edit(getBill().getToStaff()); + //System.out.println("Staff Credit Updated"); + } else if (getBill().getPaymentMethod() == PaymentMethod.PatientDeposit) { - //TODO: Update Patient Deposit + //System.out.println("Before Balance = " + bill.getPatient().getRunningBalance()); + if (bill.getPatient().getRunningBalance() == null) { + //System.out.println("Null"); + bill.getPatient().setRunningBalance(Math.abs(bill.getNetTotal())); + } else { + //System.out.println("Not Null - Add BillValue"); + bill.getPatient().setRunningBalance(bill.getPatient().getRunningBalance() + Math.abs(bill.getNetTotal())); + } + patientFacade.edit(bill.getPatient()); + //System.out.println("After Balance = " + bill.getPatient().getRunningBalance()); } - //TODO - Update Bill Payment Values - //TODO - Update Bill Paid Value printPreview = true; return ""; } + @EJB + private PatientFacade patientFacade; + public boolean sampleHasBeenCollected(Bill rf) { boolean oneItemIsSampled = false; for (BillItem bi : rf.getBillItems()) { @@ -2162,6 +2178,13 @@ public void cancelOpdBill() { } } + if (paymentMethod == PaymentMethod.Staff) { + if (getBill().getToStaff() == null) { + JsfUtil.addErrorMessage("Can't Select Staff Method"); + return; + } + } + if (!getWebUserController().hasPrivilege("OpdCancel")) { JsfUtil.addErrorMessage("You have no privilege to cancel OPD bills. Please contact System Administrator."); return; @@ -2972,7 +2995,7 @@ public String navigateViewOpdBillByBillTypeAtomic() { case PROFESSIONAL_PAYMENT_FOR_STAFF_FOR_CHANNELING_SERVICE_RETURN: case PROFESSIONAL_PAYMENT_FOR_STAFF_FOR_CHANNELING_SERVICE_SESSION: return navigateToViewChannelingProfessionalPaymentBill(); - + case OPD_BATCH_BILL_TO_COLLECT_PAYMENT_AT_CASHIER: case OPD_BATCH_BILL_PAYMENT_COLLECTION_AT_CASHIER: case OPD_BATCH_BILL_CANCELLATION: @@ -2981,7 +3004,7 @@ public String navigateViewOpdBillByBillTypeAtomic() { case PROFESSIONAL_PAYMENT_FOR_STAFF_FOR_OPD_SERVICES: case PROFESSIONAL_PAYMENT_FOR_STAFF_FOR_OPD_SERVICES_RETURN: return navigateToViewOpdProfessionalPaymentBill(); - + } JsfUtil.addErrorMessage("Wrong Bill Type"); return ""; @@ -4090,6 +4113,22 @@ public void setReferredBy(Doctor referredBy) { this.referredBy = referredBy; } + public PatientFacade getPatientFacade() { + return patientFacade; + } + + public void setPatientFacade(PatientFacade patientFacade) { + this.patientFacade = patientFacade; + } + + public StaffFacade getStaffFacade() { + return staffFacade; + } + + public void setStaffFacade(StaffFacade staffFacade) { + this.staffFacade = staffFacade; + } + public class PaymentSummary { private long idCounter = 0; diff --git a/src/main/java/com/divudi/bean/common/CategoryController.java b/src/main/java/com/divudi/bean/common/CategoryController.java index 3591211889..1da43405b0 100644 --- a/src/main/java/com/divudi/bean/common/CategoryController.java +++ b/src/main/java/com/divudi/bean/common/CategoryController.java @@ -23,7 +23,6 @@ import com.divudi.facade.CategoryFacade; import com.divudi.bean.common.util.JsfUtil; import com.divudi.data.SymanticHyrachi; -import com.divudi.data.SymanticType; import java.io.Serializable; import java.util.ArrayList; import java.util.Date; diff --git a/src/main/java/com/divudi/bean/common/CategoryItemController.java b/src/main/java/com/divudi/bean/common/CategoryItemController.java index 23d57488ce..756ed0b190 100644 --- a/src/main/java/com/divudi/bean/common/CategoryItemController.java +++ b/src/main/java/com/divudi/bean/common/CategoryItemController.java @@ -12,11 +12,9 @@ import com.divudi.entity.Category; import com.divudi.entity.CategoryItem; -import com.divudi.entity.Institution; import com.divudi.facade.CategoryItemFacade; import java.io.Serializable; -import java.util.ArrayList; import java.util.Date; import java.util.HashMap; import java.util.List; diff --git a/src/main/java/com/divudi/bean/common/ClinicalFindingValueController.java b/src/main/java/com/divudi/bean/common/ClinicalFindingValueController.java index c44b727bec..b6a7657b85 100644 --- a/src/main/java/com/divudi/bean/common/ClinicalFindingValueController.java +++ b/src/main/java/com/divudi/bean/common/ClinicalFindingValueController.java @@ -14,8 +14,6 @@ import com.divudi.entity.clinical.ClinicalFindingValue; import com.divudi.facade.ClinicalFindingValueFacade; import java.io.Serializable; -import java.util.ArrayList; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/com/divudi/bean/common/CommonFunctionsController.java b/src/main/java/com/divudi/bean/common/CommonFunctionsController.java index 009de7ccfe..f27874c9cd 100644 --- a/src/main/java/com/divudi/bean/common/CommonFunctionsController.java +++ b/src/main/java/com/divudi/bean/common/CommonFunctionsController.java @@ -5,7 +5,6 @@ import com.divudi.data.dataStructure.DateRange; import com.divudi.data.dataStructure.YearMonthDay; import java.util.Calendar; -import java.util.Date; import java.util.TimeZone; import javax.enterprise.context.ApplicationScoped; import javax.inject.Named; @@ -13,10 +12,6 @@ import java.time.ZoneId; import java.time.LocalDate; import java.time.LocalDateTime; -import java.time.ZonedDateTime; -import java.time.temporal.ChronoUnit; -import java.util.ArrayList; -import java.util.List; /** * diff --git a/src/main/java/com/divudi/bean/common/ConfigOptionApplicationController.java b/src/main/java/com/divudi/bean/common/ConfigOptionApplicationController.java index 03e23a4460..2b5924827f 100644 --- a/src/main/java/com/divudi/bean/common/ConfigOptionApplicationController.java +++ b/src/main/java/com/divudi/bean/common/ConfigOptionApplicationController.java @@ -11,7 +11,6 @@ import com.divudi.facade.ConfigOptionFacade; import javax.inject.Named; import java.io.Serializable; -import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.Date; @@ -22,9 +21,6 @@ import javax.annotation.PostConstruct; import javax.ejb.EJB; import javax.enterprise.context.ApplicationScoped; -import javax.faces.context.ExternalContext; -import javax.faces.context.FacesContext; -import org.json.JSONArray; /** * diff --git a/src/main/java/com/divudi/bean/common/ConfigOptionController.java b/src/main/java/com/divudi/bean/common/ConfigOptionController.java index 8e4981bdbb..0cd4b6ddaf 100644 --- a/src/main/java/com/divudi/bean/common/ConfigOptionController.java +++ b/src/main/java/com/divudi/bean/common/ConfigOptionController.java @@ -17,7 +17,6 @@ import java.io.Serializable; import java.util.ArrayList; import java.util.Date; -import java.util.EnumSet; import java.util.HashMap; import java.util.List; import java.util.Locale; diff --git a/src/main/java/com/divudi/bean/common/ConsultantController.java b/src/main/java/com/divudi/bean/common/ConsultantController.java index 431c8a4a53..5ad882808c 100644 --- a/src/main/java/com/divudi/bean/common/ConsultantController.java +++ b/src/main/java/com/divudi/bean/common/ConsultantController.java @@ -12,7 +12,6 @@ import com.divudi.entity.Doctor; import com.divudi.entity.Person; import com.divudi.entity.Speciality; -import com.divudi.entity.Vocabulary; import com.divudi.facade.ConsultantFacade; import com.divudi.facade.PersonFacade; import java.io.Serializable; diff --git a/src/main/java/com/divudi/bean/common/DataAdministrationController.java b/src/main/java/com/divudi/bean/common/DataAdministrationController.java index 965d1692f8..ea955a84da 100644 --- a/src/main/java/com/divudi/bean/common/DataAdministrationController.java +++ b/src/main/java/com/divudi/bean/common/DataAdministrationController.java @@ -52,7 +52,6 @@ import com.divudi.facade.ServiceSessionFacade; import com.divudi.facade.StaffFacade; import com.divudi.bean.common.util.JsfUtil; -import com.divudi.entity.Doctor; import java.sql.SQLSyntaxErrorException; import java.text.DecimalFormat; import java.util.ArrayList; @@ -61,7 +60,6 @@ import java.util.Date; import java.util.HashMap; import java.util.HashSet; -import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.Set; diff --git a/src/main/java/com/divudi/bean/common/DepartmentController.java b/src/main/java/com/divudi/bean/common/DepartmentController.java index 7d64ff5e10..54d7936840 100644 --- a/src/main/java/com/divudi/bean/common/DepartmentController.java +++ b/src/main/java/com/divudi/bean/common/DepartmentController.java @@ -159,14 +159,31 @@ public void fillItems() { items = getFacade().findByJpql(j); } - public List getInstitutionDepatrments(Institution ins) { + public List getInstitutionDepartments(Institution ins) { + List deps; + if (ins == null) { + deps = new ArrayList<>(); + } else { + Map m = new HashMap<>(); + m.put("ins", ins); + String jpql = "Select d From Department d " + + " where d.retired=false " + + " and d.institution=:ins " + + " and TYPE(d) <> Route " + + " order by d.name"; + deps = getFacade().findByJpql(jpql, m); + } + return deps; + } + + public List getInstitutionRoutes(Institution ins) { List deps; if (ins == null) { deps = new ArrayList<>(); } else { Map m = new HashMap(); m.put("ins", ins); - String sql = "Select d From Department d " + String sql = "Select d From Route d " + " where d.retired=false " + " and d.institution=:ins " + " order by d.name"; @@ -188,7 +205,7 @@ public List getInsDepartments(Institution currentInstituion) { String jpql = "SELECT d " + " FROM Department d " + " where d.retired=:ret " - + " and d.institution=:ins" + + " and d.institution=:ins " + " order by d.name"; currentInsDepartments = getFacade().findByJpql(jpql, m); if (currentInsDepartments == null) { @@ -509,6 +526,10 @@ public List getInstitutionDepatrments(Institution ins, DepartmentTyp public List getInstitutionDepatrments(DepartmentType departmentType) { return getInstitutionDepatrments(null, true, departmentType); } + + public List getInstitutionDepatrments(Institution ins) { + return getInstitutionDepatrments(ins, true, null); + } public List getDepartments(String jpql, Map m) { return getDepartments(jpql, m, null); diff --git a/src/main/java/com/divudi/bean/common/DoctorController.java b/src/main/java/com/divudi/bean/common/DoctorController.java index 1193c91e82..dceeb79e77 100644 --- a/src/main/java/com/divudi/bean/common/DoctorController.java +++ b/src/main/java/com/divudi/bean/common/DoctorController.java @@ -10,11 +10,9 @@ import com.divudi.bean.common.util.JsfUtil; import com.divudi.data.Title; -import com.divudi.entity.Consultant; import com.divudi.entity.Doctor; import com.divudi.entity.Person; import com.divudi.entity.Speciality; -import com.divudi.entity.Vocabulary; import com.divudi.facade.DoctorFacade; import com.divudi.facade.PersonFacade; import java.io.Serializable; diff --git a/src/main/java/com/divudi/bean/common/DoctorSpecialityController.java b/src/main/java/com/divudi/bean/common/DoctorSpecialityController.java index e0e213a74c..d5ca88cd9f 100644 --- a/src/main/java/com/divudi/bean/common/DoctorSpecialityController.java +++ b/src/main/java/com/divudi/bean/common/DoctorSpecialityController.java @@ -9,7 +9,6 @@ package com.divudi.bean.common; import com.divudi.entity.DoctorSpeciality; -import com.divudi.entity.Vocabulary; import com.divudi.facade.DoctorSpecialityFacade; import com.divudi.bean.common.util.JsfUtil; import java.io.Serializable; diff --git a/src/main/java/com/divudi/bean/common/ImageController.java b/src/main/java/com/divudi/bean/common/ImageController.java index bfe648cd42..8b2158acc4 100644 --- a/src/main/java/com/divudi/bean/common/ImageController.java +++ b/src/main/java/com/divudi/bean/common/ImageController.java @@ -3,9 +3,7 @@ import com.divudi.entity.Patient; import java.io.ByteArrayInputStream; import java.io.IOException; -import java.io.InputStream; import javax.inject.Named; -import javax.enterprise.context.SessionScoped; import java.io.Serializable; import javax.enterprise.context.RequestScoped; import javax.faces.context.FacesContext; diff --git a/src/main/java/com/divudi/bean/common/IouBillController.java b/src/main/java/com/divudi/bean/common/IouBillController.java index 3b4cf03904..ea64ec3c05 100644 --- a/src/main/java/com/divudi/bean/common/IouBillController.java +++ b/src/main/java/com/divudi/bean/common/IouBillController.java @@ -23,7 +23,6 @@ import com.divudi.facade.PersonFacade; import com.divudi.bean.common.util.JsfUtil; import com.divudi.data.BillTypeAtomic; -import com.divudi.entity.BillFee; import com.divudi.entity.Payment; import com.divudi.entity.RefundBill; import com.divudi.facade.PaymentFacade; diff --git a/src/main/java/com/divudi/bean/common/ItemApplicationController.java b/src/main/java/com/divudi/bean/common/ItemApplicationController.java index 4a38558c0d..50625a7c61 100644 --- a/src/main/java/com/divudi/bean/common/ItemApplicationController.java +++ b/src/main/java/com/divudi/bean/common/ItemApplicationController.java @@ -1,12 +1,7 @@ package com.divudi.bean.common; import com.divudi.data.ItemLight; -import com.divudi.entity.Packege; -import com.divudi.entity.Service; -import com.divudi.entity.lab.Investigation; import com.divudi.facade.ItemFacade; -import java.util.Arrays; -import java.util.Collection; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/com/divudi/bean/common/ItemController.java b/src/main/java/com/divudi/bean/common/ItemController.java index 62d2c44420..671d7e528e 100644 --- a/src/main/java/com/divudi/bean/common/ItemController.java +++ b/src/main/java/com/divudi/bean/common/ItemController.java @@ -754,6 +754,7 @@ public Item findItemByNameAndCode(String name, String code) { } } + public Item findMasterItemByName(String name) { diff --git a/src/main/java/com/divudi/bean/common/ItemFeeController.java b/src/main/java/com/divudi/bean/common/ItemFeeController.java index 3c72814112..5f1fe9b97f 100644 --- a/src/main/java/com/divudi/bean/common/ItemFeeController.java +++ b/src/main/java/com/divudi/bean/common/ItemFeeController.java @@ -23,7 +23,6 @@ import java.util.Date; import java.util.HashMap; import java.util.List; -import java.util.Map; import javax.ejb.EJB; import javax.enterprise.context.SessionScoped; import javax.faces.component.UIComponent; diff --git a/src/main/java/com/divudi/bean/common/ItemMappingController.java b/src/main/java/com/divudi/bean/common/ItemMappingController.java index bc27b5efee..7908e1e26e 100644 --- a/src/main/java/com/divudi/bean/common/ItemMappingController.java +++ b/src/main/java/com/divudi/bean/common/ItemMappingController.java @@ -8,7 +8,6 @@ import com.divudi.facade.ItemFacade; import com.divudi.facade.ItemMappingFacade; import com.divudi.bean.common.util.JsfUtil; -import com.google.common.collect.HashBiMap; import javax.inject.Named; import javax.enterprise.context.SessionScoped; import java.io.Serializable; diff --git a/src/main/java/com/divudi/bean/common/LoginController.java b/src/main/java/com/divudi/bean/common/LoginController.java index f91cbca37a..e57e512be1 100644 --- a/src/main/java/com/divudi/bean/common/LoginController.java +++ b/src/main/java/com/divudi/bean/common/LoginController.java @@ -7,7 +7,6 @@ import com.divudi.entity.Department; import com.divudi.entity.Institution; import com.divudi.entity.Logins; -import com.divudi.entity.clinical.ClinicalEntity; import com.divudi.facade.LoginsFacade; import com.divudi.java.CommonFunctions; import java.io.Serializable; diff --git a/src/main/java/com/divudi/bean/common/NotificationController.java b/src/main/java/com/divudi/bean/common/NotificationController.java index 2a78c9091d..fe5ea499e6 100644 --- a/src/main/java/com/divudi/bean/common/NotificationController.java +++ b/src/main/java/com/divudi/bean/common/NotificationController.java @@ -14,19 +14,15 @@ import com.divudi.data.OptionScope; import com.divudi.data.TriggerType; import com.divudi.data.TriggerTypeParent; -import com.divudi.entity.AppEmail; import com.divudi.entity.Bill; import com.divudi.entity.Notification; import com.divudi.facade.NotificationFacade; import java.io.Serializable; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; -import java.util.ArrayList; import java.util.Calendar; import java.util.Date; -import java.util.HashMap; import java.util.List; -import java.util.Map; import javax.ejb.EJB; import javax.enterprise.context.SessionScoped; import javax.faces.component.UIComponent; diff --git a/src/main/java/com/divudi/bean/common/OpdPreBillController.java b/src/main/java/com/divudi/bean/common/OpdPreBillController.java index c65a969cb1..c3509760e5 100644 --- a/src/main/java/com/divudi/bean/common/OpdPreBillController.java +++ b/src/main/java/com/divudi/bean/common/OpdPreBillController.java @@ -16,7 +16,6 @@ import com.divudi.data.BillType; import com.divudi.data.DepartmentType; import com.divudi.data.FeeType; -import com.divudi.data.InstitutionType; import com.divudi.data.ItemLight; import static com.divudi.data.ItemListingStrategy.ALL_ITEMS; import static com.divudi.data.ItemListingStrategy.ITEMS_MAPPED_TO_LOGGED_DEPARTMENT; @@ -56,7 +55,6 @@ import com.divudi.entity.UserPreference; import com.divudi.entity.WebUser; import com.divudi.entity.hr.WorkingTime; -import com.divudi.entity.membership.MembershipScheme; import com.divudi.facade.BillComponentFacade; import com.divudi.facade.BillFacade; import com.divudi.facade.BillFeeFacade; @@ -70,8 +68,6 @@ import com.divudi.facade.PersonFacade; import com.divudi.bean.common.util.JsfUtil; import com.divudi.data.BillTypeAtomic; -import com.divudi.entity.Family; -import com.divudi.entity.FamilyMember; import com.divudi.entity.Token; import com.divudi.facade.TokenFacade; import com.divudi.java.CommonFunctions; diff --git a/src/main/java/com/divudi/bean/common/OpdPreSettleController.java b/src/main/java/com/divudi/bean/common/OpdPreSettleController.java index cbe22fdc56..0e8b6e48c6 100644 --- a/src/main/java/com/divudi/bean/common/OpdPreSettleController.java +++ b/src/main/java/com/divudi/bean/common/OpdPreSettleController.java @@ -12,11 +12,9 @@ import com.divudi.data.BillNumberSuffix; import com.divudi.data.BillType; import com.divudi.data.BillTypeAtomic; -import com.divudi.data.FeeType; import com.divudi.data.PaymentMethod; import com.divudi.data.Sex; import com.divudi.data.Title; -import com.divudi.data.TokenType; import com.divudi.data.dataStructure.ComponentDetail; import com.divudi.data.dataStructure.PaymentMethodData; import com.divudi.data.dataStructure.YearMonthDay; @@ -24,7 +22,6 @@ import com.divudi.ejb.CashTransactionBean; import com.divudi.ejb.StaffBean; import com.divudi.entity.Bill; -import com.divudi.entity.BillEntry; import com.divudi.entity.BillFee; import com.divudi.entity.BillFeePayment; import com.divudi.entity.BillItem; @@ -42,7 +39,6 @@ import com.divudi.entity.Staff; import com.divudi.entity.Token; import com.divudi.entity.WebUser; -import com.divudi.entity.membership.MembershipScheme; import com.divudi.entity.pharmacy.PharmaceuticalBillItem; import com.divudi.entity.pharmacy.Stock; import com.divudi.facade.BillFacade; @@ -54,6 +50,7 @@ import com.divudi.facade.PaymentFacade; import com.divudi.facade.PersonFacade; import com.divudi.facade.PharmaceuticalBillItemFacade; +import com.divudi.facade.StaffFacade; import com.divudi.facade.TokenFacade; import java.io.Serializable; @@ -63,12 +60,10 @@ import java.util.Date; import java.util.HashMap; import java.util.List; -import java.util.Map; import javax.ejb.EJB; import javax.enterprise.context.SessionScoped; import javax.inject.Inject; import javax.inject.Named; -import javax.persistence.TemporalType; import org.primefaces.event.TabChangeEvent; /** @@ -122,6 +117,9 @@ public OpdPreSettleController() { TokenFacade tokenFacade; @EJB StaffBean staffBean; + @EJB + private StaffFacade staffFacade; + ///////////////////////// Item selectedAlternative; @@ -1703,26 +1701,36 @@ public Payment createPaymentForCancellationsforOPDBill(Bill bill, PaymentMethod p.setCreater(getSessionController().getLoggedUser()); p.setPaymentMethod(pm); - System.out.println("pm = " + pm); + //System.out.println("pm = " + pm); if (pm == PaymentMethod.PatientDeposit) { - System.out.println("Before Balance = " + bill.getPatient().getRunningBalance()); + //System.out.println("Before Balance = " + bill.getPatient().getRunningBalance()); if (bill.getPatient().getRunningBalance() == null) { - System.out.println("Null"); + //System.out.println("Null"); bill.getPatient().setRunningBalance(Math.abs(bill.getNetTotal())); } else { - System.out.println("Not Null - Add BillValue"); + //System.out.println("Not Null - Add BillValue"); bill.getPatient().setRunningBalance(bill.getPatient().getRunningBalance() + Math.abs(bill.getNetTotal())); } patientFacade.edit(bill.getPatient()); - System.out.println("After Balance = " + bill.getPatient().getRunningBalance()); + //System.out.println("After Balance = " + bill.getPatient().getRunningBalance()); + } + + if (pm == PaymentMethod.Staff) { + //System.out.println("PaymentMethod - Staff"); + //System.out.println("Before Balance = " + bill.getToStaff().getCurrentCreditValue()); + bill.getToStaff().setCurrentCreditValue( bill.getToStaff().getCurrentCreditValue() - Math.abs(bill.getNetTotal())); + //System.out.println("After Balance = " + bill.getToStaff().getCurrentCreditValue()); + staffFacade.edit(bill.getToStaff()); + //System.out.println("Staff Credit Updated"); } - System.out.println("001"); + + //System.out.println("001"); if (p.getId() == null) { getPaymentFacade().create(p); } getPaymentFacade().edit(p); - System.out.println("End Payment"); + //System.out.println("End Payment"); return p; } @@ -2017,4 +2025,12 @@ public void setForeigner(boolean foreigner) { this.foreigner = foreigner; } + public StaffFacade getStaffFacade() { + return staffFacade; + } + + public void setStaffFacade(StaffFacade staffFacade) { + this.staffFacade = staffFacade; + } + } diff --git a/src/main/java/com/divudi/bean/common/OpdTabPreBillController.java b/src/main/java/com/divudi/bean/common/OpdTabPreBillController.java index fd39c4b4cb..b84c0e564b 100644 --- a/src/main/java/com/divudi/bean/common/OpdTabPreBillController.java +++ b/src/main/java/com/divudi/bean/common/OpdTabPreBillController.java @@ -16,7 +16,6 @@ import com.divudi.data.BillType; import com.divudi.data.DepartmentType; import com.divudi.data.FeeType; -import com.divudi.data.InstitutionType; import com.divudi.data.ItemLight; import static com.divudi.data.ItemListingStrategy.ALL_ITEMS; import static com.divudi.data.ItemListingStrategy.ITEMS_MAPPED_TO_LOGGED_DEPARTMENT; @@ -56,7 +55,6 @@ import com.divudi.entity.UserPreference; import com.divudi.entity.WebUser; import com.divudi.entity.hr.WorkingTime; -import com.divudi.entity.membership.MembershipScheme; import com.divudi.facade.BillComponentFacade; import com.divudi.facade.BillFacade; import com.divudi.facade.BillFeeFacade; diff --git a/src/main/java/com/divudi/bean/common/OpdTokenController.java b/src/main/java/com/divudi/bean/common/OpdTokenController.java index ea0219aa66..a027c5a182 100644 --- a/src/main/java/com/divudi/bean/common/OpdTokenController.java +++ b/src/main/java/com/divudi/bean/common/OpdTokenController.java @@ -9,7 +9,6 @@ import com.divudi.bean.pharmacy.PharmacyBillSearch; import com.divudi.bean.pharmacy.PharmacyPreSettleController; import com.divudi.bean.pharmacy.PharmacySaleController; -import com.divudi.data.PaymentMethod; import com.divudi.data.TokenCount; import com.divudi.data.TokenType; import com.divudi.ejb.BillNumberGenerator; diff --git a/src/main/java/com/divudi/bean/common/PatientController.java b/src/main/java/com/divudi/bean/common/PatientController.java index a7428cfaf6..6371179297 100644 --- a/src/main/java/com/divudi/bean/common/PatientController.java +++ b/src/main/java/com/divudi/bean/common/PatientController.java @@ -25,7 +25,6 @@ import com.divudi.data.PaymentMethod; import com.divudi.data.Sex; import com.divudi.data.Title; -import com.divudi.data.clinical.ClinicalFindingValueType; import com.divudi.data.dataStructure.PaymentMethodData; import com.divudi.data.dataStructure.YearMonthDay; import com.divudi.data.hr.ReportKeyWord; @@ -41,9 +40,7 @@ import com.divudi.entity.PatientEncounter; import com.divudi.entity.Person; import com.divudi.entity.Relation; -import com.divudi.entity.Staff; import com.divudi.entity.WebUser; -import com.divudi.entity.clinical.ClinicalFindingValue; import com.divudi.entity.inward.Admission; import com.divudi.entity.lab.PatientInvestigation; import com.divudi.entity.lab.PatientSample; diff --git a/src/main/java/com/divudi/bean/common/PersonInstitutionController.java b/src/main/java/com/divudi/bean/common/PersonInstitutionController.java index 8faecf00f4..e00078f94c 100644 --- a/src/main/java/com/divudi/bean/common/PersonInstitutionController.java +++ b/src/main/java/com/divudi/bean/common/PersonInstitutionController.java @@ -16,8 +16,6 @@ import com.divudi.facade.PersonInstitutionFacade; import com.divudi.facade.StaffFacade; import java.io.Serializable; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; import java.util.ArrayList; import java.util.Date; import java.util.HashMap; @@ -25,7 +23,6 @@ import java.util.Map; import javax.ejb.EJB; import javax.enterprise.context.SessionScoped; -import javax.faces.FacesException; import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; import javax.faces.convert.Converter; diff --git a/src/main/java/com/divudi/bean/common/PettyCashBillController.java b/src/main/java/com/divudi/bean/common/PettyCashBillController.java index f4c314cb9f..f1cc4d516e 100644 --- a/src/main/java/com/divudi/bean/common/PettyCashBillController.java +++ b/src/main/java/com/divudi/bean/common/PettyCashBillController.java @@ -23,7 +23,6 @@ import com.divudi.facade.PersonFacade; import com.divudi.bean.common.util.JsfUtil; import com.divudi.data.BillTypeAtomic; -import com.divudi.entity.BillFee; import com.divudi.entity.Payment; import com.divudi.entity.RefundBill; import com.divudi.facade.PaymentFacade; @@ -341,6 +340,14 @@ public Payment createPaymentForPettyCashBillReturn(Bill rb, PaymentMethod pm) { return p; } + public Payment createPaymentForPettyCashBillCancellation(Bill cb, PaymentMethod pm) { + Payment p = new Payment(); + p.setBill(cb); + p.setPaidValue(0 - Math.abs(cb.getNetTotal())); + setPaymentMethodData(p, pm); + return p; + } + public void createPaymentForPettyCashBill(Bill b, PaymentMethod pm) { Payment p = new Payment(); p.setBill(b); diff --git a/src/main/java/com/divudi/bean/common/PettyCashBillSearch.java b/src/main/java/com/divudi/bean/common/PettyCashBillSearch.java index 3be2b50b95..3ba3e1133a 100644 --- a/src/main/java/com/divudi/bean/common/PettyCashBillSearch.java +++ b/src/main/java/com/divudi/bean/common/PettyCashBillSearch.java @@ -12,6 +12,7 @@ import com.divudi.ejb.BillNumberGenerator; import com.divudi.ejb.CashTransactionBean; import com.divudi.bean.common.util.JsfUtil; +import com.divudi.data.BillTypeAtomic; import com.divudi.ejb.EjbApplication; import com.divudi.entity.Bill; import com.divudi.entity.BillComponent; @@ -20,6 +21,7 @@ import com.divudi.entity.BillItem; import com.divudi.entity.BilledBill; import com.divudi.entity.CancelledBill; +import com.divudi.entity.Payment; import com.divudi.entity.PaymentScheme; import com.divudi.entity.WebUser; import com.divudi.facade.BillComponentFacade; @@ -84,6 +86,8 @@ public class PettyCashBillSearch implements Serializable { SessionController sessionController; @Inject private WebUserController webUserController; + @Inject + PettyCashBillController pettyCashBillController; @EJB EjbApplication ejbApplication; private List tempbillItems; @@ -257,6 +261,7 @@ private CancelledBill createCancelBill() { cb.setCreater(getSessionController().getLoggedUser()); cb.setDepartment(getSessionController().getDepartment()); cb.setInstitution(getSessionController().getInstitution()); + cb.setBillTypeAtomic(BillTypeAtomic.PETTY_CASH_BILL_CANCELLATION); cb.setPaymentMethod(paymentMethod); cb.setComments(comment); @@ -308,7 +313,6 @@ public void cancelBill() { } CancelledBill cb = createCancelBill(); - //Copy & paste //if (webUserController.hasPrivilege("LabBillCancelling")) { if (true) { @@ -321,6 +325,7 @@ public void cancelBill() { WebUser wb = getCashTransactionBean().saveBillCashInTransaction(cb, getSessionController().getLoggedUser()); getSessionController().setLoggedUser(wb); + Payment p = pettyCashBillController.createPaymentForPettyCashBillCancellation(cb, paymentMethod); printPreview = true; } else { getEjbApplication().getBillsToCancel().add(cb); diff --git a/src/main/java/com/divudi/bean/common/PriceMatrixController.java b/src/main/java/com/divudi/bean/common/PriceMatrixController.java index 263be2c1b8..65830ff091 100644 --- a/src/main/java/com/divudi/bean/common/PriceMatrixController.java +++ b/src/main/java/com/divudi/bean/common/PriceMatrixController.java @@ -27,7 +27,6 @@ import com.divudi.entity.membership.PaymentSchemeDiscount; import com.divudi.entity.membership.PharmacyMemberShipDiscount; import com.divudi.facade.PaymentSchemeDiscountFacade; -import com.divudi.facade.PaymentSchemeFacade; import com.divudi.facade.PriceMatrixFacade; import java.io.Serializable; import java.util.Date; diff --git a/src/main/java/com/divudi/bean/common/RevinewReportController.java b/src/main/java/com/divudi/bean/common/RevinewReportController.java index b360e87927..be1ca5baeb 100644 --- a/src/main/java/com/divudi/bean/common/RevinewReportController.java +++ b/src/main/java/com/divudi/bean/common/RevinewReportController.java @@ -18,7 +18,6 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; -import javax.ejb.EJB; import javax.enterprise.context.SessionScoped; import javax.inject.Inject; import javax.inject.Named; diff --git a/src/main/java/com/divudi/bean/common/RouteController.java b/src/main/java/com/divudi/bean/common/RouteController.java index 4e957165c7..a0c663ca7d 100644 --- a/src/main/java/com/divudi/bean/common/RouteController.java +++ b/src/main/java/com/divudi/bean/common/RouteController.java @@ -8,8 +8,6 @@ */ package com.divudi.bean.common; -import com.divudi.data.InstitutionType; -import com.divudi.entity.Institution; import com.divudi.entity.Route; import com.divudi.facade.RouteFacade; import com.divudi.bean.common.util.JsfUtil; diff --git a/src/main/java/com/divudi/bean/common/SearchController.java b/src/main/java/com/divudi/bean/common/SearchController.java index f14289fdf8..4c2420a0eb 100644 --- a/src/main/java/com/divudi/bean/common/SearchController.java +++ b/src/main/java/com/divudi/bean/common/SearchController.java @@ -13,7 +13,6 @@ import com.divudi.data.FeeType; import com.divudi.data.InstitutionType; import com.divudi.data.PaymentMethod; -import com.divudi.data.MessageType; import com.divudi.data.dataStructure.SearchKeyword; import com.divudi.data.hr.ReportKeyWord; @@ -56,13 +55,11 @@ import com.divudi.data.BillClassType; import com.divudi.data.BillFinanceType; import com.divudi.data.BillTypeAtomic; -import com.divudi.data.CountedServiceType; import com.divudi.data.ServiceType; import com.divudi.data.analytics.ReportTemplateType; import com.divudi.entity.Payment; import com.divudi.entity.WebUser; import com.divudi.entity.pharmacy.PharmaceuticalBillItem; -import com.divudi.entity.pharmacy.PharmaceuticalItem; import com.divudi.facade.PaymentFacade; import com.divudi.facade.PharmaceuticalBillItemFacade; import com.divudi.facade.TokenFacade; @@ -977,6 +974,60 @@ public void fillToSelectedDepartmentPatientInvestigations() { checkRefundBillItems(patientInvestigations); } + + + public void fillCollectingCentreCourierPatientInvestigations() { + String jpql = "select pi " + + " from PatientInvestigation pi " + + " join pi.investigation i " + + " join pi.billItem.bill b " + + " join b.patient.person p " + + " where " + + " b.createdAt between :fromDate and :toDate " + + " and pi.investigation.department=:dep "; + + Map temMap = new HashMap(); + temMap.put("toDate", getToDate()); + temMap.put("fromDate", getFromDate()); + temMap.put("dep", getReportKeyWord().getDepartment()); + + if(institution==null){ + jpql += " and b.collectingCentre in :ccs "; + temMap.put("ccs", sessionController.getLoggableCollectingCentres()); + }else{ + jpql += " and b.collectingCentre=:cc "; + temMap.put("cc", sessionController.getLoggableCollectingCentres()); + } + + if (getSearchKeyword().getPatientName() != null && !getSearchKeyword().getPatientName().trim().equals("")) { + jpql += " and ((p.name) like :patientName )"; + temMap.put("patientName", "%" + getSearchKeyword().getPatientName().trim().toUpperCase() + "%"); + } + + if (getSearchKeyword().getBillNo() != null && !getSearchKeyword().getBillNo().trim().equals("")) { + jpql += " and ((b.deptId) like :billNo )"; + temMap.put("billNo", "%" + getSearchKeyword().getBillNo().trim().toUpperCase() + "%"); + } + + if (getSearchKeyword().getPatientPhone() != null && !getSearchKeyword().getPatientPhone().trim().equals("")) { + jpql += " and ((p.phone) like :patientPhone )"; + temMap.put("patientPhone", "%" + getSearchKeyword().getPatientPhone().trim().toUpperCase() + "%"); + } + + if (getSearchKeyword().getItemName() != null && !getSearchKeyword().getItemName().trim().equals("")) { + jpql += " and ((i.name) like :itm )"; + temMap.put("itm", "%" + getSearchKeyword().getItemName().trim().toUpperCase() + "%"); + } + + + + jpql += " order by pi.id desc "; +// + + patientInvestigations = getPatientInvestigationFacade().findByJpql(jpql, temMap, TemporalType.TIMESTAMP, 50); + checkRefundBillItems(patientInvestigations); + + } public void createPreRefundTable() { @@ -4472,6 +4523,11 @@ public void createDueFeeTable() { sql += " and ((b.billItem.item.name) like :staff )"; temMap.put("staff", "%" + getSearchKeyword().getItemName().trim().toUpperCase() + "%"); } + + if (getSearchKeyword().getBhtNo() != null && !getSearchKeyword().getBhtNo().trim().equals("")) { + sql += " and ((b.paidForBillFee.bill.patientEncounter.bhtNo) like :bht )"; + temMap.put("bht", "%" + getSearchKeyword().getBhtNo().trim().toUpperCase() + "%"); + } sql += " order by b.staff.id "; @@ -4540,6 +4596,11 @@ public void createDueFeeTableAll() { sql += " and ((b.billItem.item.name) like :staff )"; temMap.put("staff", "%" + getSearchKeyword().getItemName().trim().toUpperCase() + "%"); } + + if (getSearchKeyword().getBhtNo() != null && !getSearchKeyword().getBhtNo().trim().equals("")) { + sql += " and ((b.paidForBillFee.bill.patientEncounter.bhtNo) like :bht )"; + temMap.put("bht", "%" + getSearchKeyword().getBhtNo().trim().toUpperCase() + "%"); + } sql += " order by b.staff.id "; @@ -5130,6 +5191,11 @@ public void createPaymentTable() { sql += " and b.paidForBillFee.bill.creditCompany=:cc "; temMap.put("cc", getReportKeyWord().getInstitution()); } + + if (getSearchKeyword().getBhtNo() != null && !getSearchKeyword().getBhtNo().trim().equals("")) { + sql += " and ((b.paidForBillFee.bill.patientEncounter.bhtNo) like :bht )"; + temMap.put("bht", "%" + getSearchKeyword().getBhtNo().trim().toUpperCase() + "%"); + } sql += " order by b.createdAt desc "; @@ -5194,6 +5260,11 @@ public void createPaymentTableAll() { sql += " and b.paidForBillFee.bill.creditCompany=:cc "; temMap.put("cc", getReportKeyWord().getInstitution()); } + + if (getSearchKeyword().getBhtNo() != null && !getSearchKeyword().getBhtNo().trim().equals("")) { + sql += " and ((b.paidForBillFee.bill.patientEncounter.bhtNo) like :bht )"; + temMap.put("bht", "%" + getSearchKeyword().getBhtNo().trim().toUpperCase() + "%"); + } sql += " order by b.createdAt desc "; @@ -7080,13 +7151,17 @@ public void createStaffCreditBillList() { jpql = "select b from Bill b " + "where b.toStaff is not null " + "and b.createdAt between :fromDate and :toDate " - + "and b.retired = false "; + + "and b.retired = false " + + "and b.cancelled = false " + + "and b.refunded = false "; jpql += " and b.billTypeAtomic in :btas "; btas.addAll(BillTypeAtomic.findByServiceType(ServiceType.OPD)); btas.addAll(BillTypeAtomic.findByServiceType(ServiceType.CHANNELLING)); btas.removeAll(BillTypeAtomic.findByCategory(BillCategory.PAYMENTS)); - + btas.removeAll(BillTypeAtomic.findByCategory(BillCategory.CANCELLATION)); + btas.removeAll(BillTypeAtomic.findByCategory(BillCategory.REFUND)); + jpql += " order by b.createdAt desc"; m.put("fromDate", fromDate); @@ -10805,7 +10880,7 @@ public void listnerBillTypeChange() { public String navigateToLabReportSearch() { patientInvestigations = new ArrayList<>(); getReportKeyWord().setDepartment(getSessionController().getLoggedUser().getDepartment()); - return "/lab/search_for_reporting_ondemand"; + return "/lab/search_for_reporting_ondemand?faces-redirect=true"; } public String navigateToListSingleUserBills() { @@ -11401,4 +11476,6 @@ public void setPharmacyAdjustmentRows(List pharmacyAdjust this.pharmacyAdjustmentRows = pharmacyAdjustmentRows; } + + } diff --git a/src/main/java/com/divudi/bean/common/SecurityController.java b/src/main/java/com/divudi/bean/common/SecurityController.java index 7181e0909a..8092338906 100644 --- a/src/main/java/com/divudi/bean/common/SecurityController.java +++ b/src/main/java/com/divudi/bean/common/SecurityController.java @@ -14,7 +14,6 @@ import org.jasypt.util.text.BasicTextEncryptor; import java.security.SecureRandom; import java.util.HashMap; -import java.util.Locale; import java.util.Map; /** diff --git a/src/main/java/com/divudi/bean/common/ServiceController.java b/src/main/java/com/divudi/bean/common/ServiceController.java index 684b5c2c9b..b0c158abd3 100644 --- a/src/main/java/com/divudi/bean/common/ServiceController.java +++ b/src/main/java/com/divudi/bean/common/ServiceController.java @@ -16,12 +16,10 @@ import com.divudi.data.inward.InwardChargeType; import com.divudi.entity.Category; import com.divudi.entity.Department; -import com.divudi.entity.Fee; import com.divudi.entity.Institution; import com.divudi.entity.Item; import com.divudi.entity.ItemFee; import com.divudi.entity.Service; -import com.divudi.entity.clinical.ClinicalEntity; import com.divudi.facade.CategoryFacade; import com.divudi.facade.DepartmentFacade; import com.divudi.facade.FeeFacade; @@ -34,7 +32,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Date; -import java.util.HashMap; import java.util.List; import javax.ejb.EJB; import javax.enterprise.context.SessionScoped; @@ -54,7 +51,6 @@ import java.util.HashMap; import java.util.Map; import javax.servlet.http.HttpServletResponse; -import java.util.Random; /** * diff --git a/src/main/java/com/divudi/bean/common/ServiceSessionController.java b/src/main/java/com/divudi/bean/common/ServiceSessionController.java index c1e9bb864d..4f2fe006b7 100644 --- a/src/main/java/com/divudi/bean/common/ServiceSessionController.java +++ b/src/main/java/com/divudi/bean/common/ServiceSessionController.java @@ -7,7 +7,6 @@ * (94) 71 5812399 */ package com.divudi.bean.common; -import com.divudi.entity.Bill; import com.divudi.entity.ServiceSession; import com.divudi.facade.ServiceSessionFacade; import java.io.Serializable; diff --git a/src/main/java/com/divudi/bean/common/SessionController.java b/src/main/java/com/divudi/bean/common/SessionController.java index 4a05faaf36..f835f5fa66 100644 --- a/src/main/java/com/divudi/bean/common/SessionController.java +++ b/src/main/java/com/divudi/bean/common/SessionController.java @@ -8,6 +8,7 @@ package com.divudi.bean.common; import com.divudi.bean.channel.BookingController; +import com.divudi.bean.collectingCentre.CourierController; import com.divudi.bean.pharmacy.PharmacySaleController; import com.divudi.data.InstitutionType; import com.divudi.data.Privileges; @@ -36,6 +37,7 @@ import com.divudi.facade.WebUserPrivilegeFacade; import com.divudi.facade.WebUserRoleFacade; import com.divudi.bean.common.util.JsfUtil; +import com.divudi.entity.Route; import com.divudi.entity.Staff; import com.divudi.facade.StaffFacade; import java.io.IOException; @@ -50,7 +52,6 @@ import javax.annotation.PreDestroy; import javax.ejb.EJB; import javax.enterprise.context.SessionScoped; -import javax.faces.context.ExternalContext; import javax.inject.Inject; import javax.inject.Named; import javax.servlet.http.HttpSessionEvent; @@ -123,6 +124,8 @@ public class SessionController implements Serializable, HttpSessionListener { BookingController bookingController; @Inject ConfigOptionApplicationController configOptionApplicationController; + @Inject + CourierController courierController; /** * Properties */ @@ -145,6 +148,7 @@ public class SessionController implements Serializable, HttpSessionListener { private List loggableDepartments; private List loggableSubDepartments; private List loggableInstitutions; + private List loggableCollectingCentres; private List userIcons; Institution institution; @@ -1114,6 +1118,7 @@ private boolean checkUsersWithoutDepartment() { getFacede().edit(u); setLoggedUser(u); loggableDepartments = fillLoggableDepts(); + loggableCollectingCentres = fillLoggableCollectingCentres(); if (webUserController.grantAllPrivilegesToAllUsersForTesting) { loggableDepartments = departmentController.fillAllItems(); } @@ -1275,6 +1280,8 @@ public String navigateToLoginPageByUsersDefaultLoginPage() { return opdTokenController.navigateToManageOpdTokensCalled(); case PHARMACY_TOKEN_DISPLAY: return tokenController.navigateToManagePharmacyTokensCalled(); + case COURIER_LANDING_PAGE: + return courierController.navigateToCourierIndex(); case HOME: default: return "/home?faces-redirect=true"; @@ -1473,6 +1480,24 @@ public List fillLoggableInstitutions() { + " order by wd.department.institution.name"; return institutionFacade.findByJpql(jpql, m); } + + public List fillLoggableCollectingCentres() { + WebUser e = getLoggedUser(); + if (e == null) { + return new ArrayList<>(); + } + String jpql; + Map m = new HashMap(); + jpql = "select i " + + " from Institution i " + + " where i.retired<>:ret " + + " and i.route in :lds " + + " and i.institutionType=:cc "; + m.put("ret", true); + m.put("cc", InstitutionType.CollectingCentre); + m.put("lds", loggableDepartments); + return institutionFacade.findByJpql(jpql, m); + } public ApplicationEjb getApplicationEjb() { return applicationEjb; @@ -1501,6 +1526,7 @@ public void logout() { loggableDepartments = null; loggableSubDepartments = null; loggableInstitutions = null; + loggableCollectingCentres=null; userIcons = null; setLogged(false); setActivated(false); @@ -2120,6 +2146,7 @@ public List getLoggableInstitutions() { return loggableInstitutions; } + public List getUserIcons() { return userIcons; } @@ -2127,36 +2154,38 @@ public List getUserIcons() { public void setUserIcons(List userIcons) { this.userIcons = userIcons; } - - private void createUserPrivilegesForAllDepartments(WebUser tmpLoggedUser, Department loggedDept, List tmpLoggableDeps) { - List twups = fillUserPrivileges(tmpLoggedUser, null, true); - if (tmpLoggedUser == null) { - return; - } - if (loggedDept == null) { - return; - } - if (tmpLoggableDeps == null) { - return; - } - if (tmpLoggableDeps.isEmpty()) { - return; - } - List tds = tmpLoggableDeps; - tds.remove(loggedDept); - for (WebUserPrivilege twup : twups) { - twup.setDepartment(loggedDept); - getWebUserPrivilegeFacade().edit(twup); - for (Department d : tds) { - WebUserPrivilege nwup = new WebUserPrivilege(); - nwup.setWebUser(tmpLoggedUser); - nwup.setDepartment(d); - nwup.setPrivilege(twup.getPrivilege()); - getWebUserPrivilegeFacade().create(nwup); - } - } - - } + + +// +// private void createUserPrivilegesForAllDepartments(WebUser tmpLoggedUser, Department loggedDept, List tmpLoggableDeps) { +// List twups = fillUserPrivileges(tmpLoggedUser, null, true); +// if (tmpLoggedUser == null) { +// return; +// } +// if (loggedDept == null) { +// return; +// } +// if (tmpLoggableDeps == null) { +// return; +// } +// if (tmpLoggableDeps.isEmpty()) { +// return; +// } +// List tds = tmpLoggableDeps; +// tds.remove(loggedDept); +// for (WebUserPrivilege twup : twups) { +// twup.setDepartment(loggedDept); +// getWebUserPrivilegeFacade().edit(twup); +// for (Department d : tds) { +// WebUserPrivilege nwup = new WebUserPrivilege(); +// nwup.setWebUser(tmpLoggedUser); +// nwup.setDepartment(d); +// nwup.setPrivilege(twup.getPrivilege()); +// getWebUserPrivilegeFacade().create(nwup); +// } +// } +// +// } public List getLoggableSubDepartments() { return loggableSubDepartments; @@ -2166,4 +2195,12 @@ public void setLoggableSubDepartments(List loggableSubDepartments) { this.loggableSubDepartments = loggableSubDepartments; } + public List getLoggableCollectingCentres() { + return loggableCollectingCentres; + } + + public void setLoggableCollectingCentres(List loggableCollectingCentres) { + this.loggableCollectingCentres = loggableCollectingCentres; + } + } diff --git a/src/main/java/com/divudi/bean/common/SessionNumberGenerateController.java b/src/main/java/com/divudi/bean/common/SessionNumberGenerateController.java index 2834d04287..685027a95f 100644 --- a/src/main/java/com/divudi/bean/common/SessionNumberGenerateController.java +++ b/src/main/java/com/divudi/bean/common/SessionNumberGenerateController.java @@ -2,7 +2,6 @@ import com.divudi.bean.channel.ChannelScheduleController; import com.divudi.entity.SessionNumberGenerator; -import com.divudi.entity.Speciality; import com.divudi.facade.SessionNumberGeneratorFacade; import java.io.Serializable; import java.util.HashMap; diff --git a/src/main/java/com/divudi/bean/common/SmsController.java b/src/main/java/com/divudi/bean/common/SmsController.java index 10cd03fb0c..9a135b95a2 100644 --- a/src/main/java/com/divudi/bean/common/SmsController.java +++ b/src/main/java/com/divudi/bean/common/SmsController.java @@ -5,20 +5,15 @@ */ package com.divudi.bean.common; -import com.divudi.data.ApplicationInstitution; import com.divudi.data.MessageType; -import com.divudi.data.SmsSentResponse; import com.divudi.data.hr.ReportKeyWord; import com.divudi.ejb.SmsManagerEjb; -import com.divudi.entity.Bill; import com.divudi.entity.Sms; -import com.divudi.entity.UserPreference; import com.divudi.facade.SmsFacade; import com.divudi.bean.common.util.JsfUtil; import com.divudi.java.CommonFunctions; -import java.util.ArrayList; import java.util.List; import java.util.Map; diff --git a/src/main/java/com/divudi/bean/common/StaffPaymentBillController.java b/src/main/java/com/divudi/bean/common/StaffPaymentBillController.java index 84b7438d77..2432e3b813 100644 --- a/src/main/java/com/divudi/bean/common/StaffPaymentBillController.java +++ b/src/main/java/com/divudi/bean/common/StaffPaymentBillController.java @@ -46,9 +46,7 @@ import com.divudi.data.BillTypeAtomic; import com.divudi.data.Title; import com.divudi.data.dataStructure.PaymentMethodData; -import com.divudi.entity.Person; import java.text.DecimalFormat; -import org.primefaces.event.TabChangeEvent; /** * diff --git a/src/main/java/com/divudi/bean/common/TokenController.java b/src/main/java/com/divudi/bean/common/TokenController.java index a00f69c053..8139fba3e1 100644 --- a/src/main/java/com/divudi/bean/common/TokenController.java +++ b/src/main/java/com/divudi/bean/common/TokenController.java @@ -13,9 +13,7 @@ import com.divudi.entity.Patient; import com.divudi.entity.Person; import com.divudi.entity.PreBill; -import com.divudi.entity.Staff; import com.divudi.entity.Token; -import com.divudi.entity.WebUser; import com.divudi.facade.BillFacade; import com.divudi.facade.BillItemFacade; import com.divudi.facade.TokenFacade; diff --git a/src/main/java/com/divudi/bean/common/TriggerSubscriptionController.java b/src/main/java/com/divudi/bean/common/TriggerSubscriptionController.java index f984f4157a..e0ebe7b83d 100644 --- a/src/main/java/com/divudi/bean/common/TriggerSubscriptionController.java +++ b/src/main/java/com/divudi/bean/common/TriggerSubscriptionController.java @@ -9,7 +9,6 @@ import com.divudi.facade.WebUserFacade; import java.io.Serializable; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collections; import java.util.Comparator; import java.util.Date; diff --git a/src/main/java/com/divudi/bean/common/UploadViewController.java b/src/main/java/com/divudi/bean/common/UploadViewController.java index 04f652ff69..bbb8d794ea 100644 --- a/src/main/java/com/divudi/bean/common/UploadViewController.java +++ b/src/main/java/com/divudi/bean/common/UploadViewController.java @@ -1,6 +1,5 @@ package com.divudi.bean.common; -import com.divudi.entity.Staff; import com.divudi.entity.Upload; import com.divudi.facade.UploadFacade; import java.io.ByteArrayInputStream; diff --git a/src/main/java/com/divudi/bean/common/UserDepartmentController.java b/src/main/java/com/divudi/bean/common/UserDepartmentController.java index 1c0785fdd3..8dad49f1be 100644 --- a/src/main/java/com/divudi/bean/common/UserDepartmentController.java +++ b/src/main/java/com/divudi/bean/common/UserDepartmentController.java @@ -163,6 +163,26 @@ public void addDepartmentForUser() { currentDepartment = null; } + + + public void addRouteForUser() { + if (selectedUser == null) { + JsfUtil.addSuccessMessage("Select A User"); + return; + } + if (currentDepartment == null) { + JsfUtil.addSuccessMessage("Select a Route"); + return; + } + WebUserDepartment d = new WebUserDepartment(); + d.setCreatedAt(Calendar.getInstance().getTime()); + d.setDepartment(currentDepartment); + d.setWebUser(selectedUser); + getEjbFacade().create(d); + items=null; + currentDepartment = null; + + } public List fillWebUserDepartments(WebUser wu) { List tis = new ArrayList<>(); diff --git a/src/main/java/com/divudi/bean/common/UserIconController.java b/src/main/java/com/divudi/bean/common/UserIconController.java index 6610bde34b..b8d6e78f45 100644 --- a/src/main/java/com/divudi/bean/common/UserIconController.java +++ b/src/main/java/com/divudi/bean/common/UserIconController.java @@ -12,7 +12,6 @@ import com.divudi.entity.Department; import com.divudi.entity.UserIcon; import com.divudi.entity.WebUser; -import com.divudi.facade.DepartmentFacade; import com.divudi.facade.UserIconFacade; import com.divudi.bean.common.util.JsfUtil; import java.io.Serializable; @@ -21,10 +20,8 @@ import java.util.Collections; import java.util.Comparator; import java.util.HashMap; -import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Set; import javax.ejb.EJB; import javax.enterprise.context.SessionScoped; import javax.faces.component.UIComponent; diff --git a/src/main/java/com/divudi/bean/common/UserNotificationController.java b/src/main/java/com/divudi/bean/common/UserNotificationController.java index 4898e8c930..ffa1e444fe 100644 --- a/src/main/java/com/divudi/bean/common/UserNotificationController.java +++ b/src/main/java/com/divudi/bean/common/UserNotificationController.java @@ -16,24 +16,18 @@ import com.divudi.data.BillTypeAtomic; import static com.divudi.data.BillTypeAtomic.PHARMACY_ORDER; import static com.divudi.data.BillTypeAtomic.PHARMACY_TRANSFER_REQUEST; -import com.divudi.data.MessageType; import com.divudi.data.OptionScope; -import com.divudi.data.SmsSentResponse; -import com.divudi.data.TriggerType; import com.divudi.ejb.SmsManagerEjb; import com.divudi.entity.Bill; import com.divudi.entity.Department; import com.divudi.entity.UserNotification; -import com.divudi.entity.Institution; import com.divudi.entity.Notification; import com.divudi.entity.Sms; -import com.divudi.entity.TriggerSubscription; import com.divudi.entity.WebUser; import com.divudi.facade.NotificationFacade; import com.divudi.facade.SmsFacade; import com.divudi.facade.UserNotificationFacade; import java.io.Serializable; -import java.util.ArrayList; import java.util.Date; import java.util.HashMap; import java.util.Iterator; diff --git a/src/main/java/com/divudi/bean/common/UserPrivilageController.java b/src/main/java/com/divudi/bean/common/UserPrivilageController.java index 0a22c2ed60..8f89f303ac 100644 --- a/src/main/java/com/divudi/bean/common/UserPrivilageController.java +++ b/src/main/java/com/divudi/bean/common/UserPrivilageController.java @@ -72,6 +72,7 @@ public class UserPrivilageController implements Serializable { private Department department; private List departments; private List currentUserPrivilegeHolders; + private boolean privilegesLoaded; // // @@ -105,486 +106,508 @@ private TreeNode createPrivilegeHolderTreeNodes() { TreeNode allNode = new DefaultTreeNode(new PrivilegeHolder(null, "Privileges for All Sections"), root); + // OPD Privileges TreeNode opdNode = new DefaultTreeNode(new PrivilegeHolder(null, "OPD"), allNode); - - TreeNode billingMenuNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.Opd, "Billing Menu"), opdNode); - - TreeNode billNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.OpdBilling, "Bill"), opdNode); - TreeNode preBillingNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.OpdPreBilling, "Pre Billing"), opdNode); - TreeNode collectingCentreBillingNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.OpdCollectingCentreBilling, "Collecting Centre Billing"), opdNode); - TreeNode billSearchNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.OpdBillSearch, "Bill Search"), opdNode); - TreeNode billItemSearchNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.OpdBillItemSearch, "Bill Item Search"), opdNode); - TreeNode reprintNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.OpdReprint, "Reprint"), opdNode); - TreeNode cancelNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.OpdCancel, "Cancel"), opdNode); - TreeNode returnNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.OpdReturn, "Return"), opdNode); - TreeNode reactivateNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.OpdReactivate, "Reactivate"), opdNode); - TreeNode OpdLabReportSearchNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.OpdLabReportSearch, "Lab Report Search"), opdNode); - TreeNode opdBillSearchEditNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.OpdBillSearchEdit, "OPD Bill Search Edit (Patient Details)"), opdNode); - TreeNode OpdReprintOriginalBillNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.OpdReprintOriginalBill, "Reprint the Original Bill"), opdNode); - TreeNode addCreditLimit = new DefaultTreeNode(new PrivilegeHolder(Privileges.AddCreditLimitInRegistration, "Add Credit Limit During Patient Registration"), opdNode); - + new DefaultTreeNode(new PrivilegeHolder(Privileges.Opd, "Billing Menu"), opdNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.OpdBilling, "Bill"), opdNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.OpdPreBilling, "Pre Billing"), opdNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.OpdCollectingCentreBilling, "Collecting Centre Billing"), opdNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.OpdBillSearch, "Bill Search"), opdNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.OpdBillItemSearch, "Bill Item Search"), opdNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.OpdReprint, "Reprint"), opdNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.OpdCancel, "Cancel"), opdNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.OpdReturn, "Return"), opdNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.OpdReactivate, "Reactivate"), opdNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.OpdLabReportSearch, "Lab Report Search"), opdNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.OpdBillSearchEdit, "OPD Bill Search Edit (Patient Details)"), opdNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.OpdReprintOriginalBill, "Reprint Original Bill"), opdNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.AddCreditLimitInRegistration, "Add Credit Limit During Patient Registration"), opdNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.OpdAddNewRefferalDoctor, "Add New Referral Doctor"), opdNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.OpdAddNewCollectingCentre, "Add New Collecting Centre"), opdNode); + + // Inward Privileges TreeNode inwardNode = new DefaultTreeNode(new PrivilegeHolder(null, "Inward"), allNode); - TreeNode inwardMenuNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.Inward, "Inward Menu"), inwardNode); - TreeNode admissionsNode = new DefaultTreeNode("Admissions", inwardNode); - TreeNode admissionMenuNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.InwardAdmissions, "Admission Menu"), admissionsNode); - TreeNode admissionNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.InwardAdmissionsAdmission, "Admission"), admissionsNode); - TreeNode editAdmissionDetailsNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.InwardAdmissionsEditAdmission, "Edit Admission Details"), admissionsNode); - TreeNode inwardAppointmentNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.InwardAdmissionsInwardAppoinment, "Inward Appointment"), admissionsNode); - - TreeNode roomNode = new DefaultTreeNode("Room", inwardNode); - TreeNode roomMenuNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.InwardRoom, "Room Menu"), roomNode); - TreeNode roomOccupancyNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.InwardRoomRoomOccupency, "Room Occupancy"), roomNode); - TreeNode roomChangeNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.InwardRoomRoomChange, "Room Change"), roomNode); - TreeNode guardianRoomChangeNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.InwardRoomGurdianRoomChange, "Guardian Room Change"), roomNode); - TreeNode dischargeRoomOccupancyNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.InwardRoomDischarge, "Discharge Room in Room Occupancy"), roomNode); - - TreeNode servicesItemsNode = new DefaultTreeNode("Services & Items", inwardNode); - TreeNode servicesItemsMenuNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.InwardServicesAndItems, "Services & Items Menu"), servicesItemsNode); - TreeNode addServicesNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.InwardServicesAndItemsAddServices, "Add Services"), servicesItemsNode); - TreeNode addOutsideChargesNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.InwardServicesAndItemsAddOutSideCharges, "Add Outside Charges"), servicesItemsNode); - TreeNode addProfessionalFeeNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.InwardServicesAndItemsAddProfessionalFee, "Add Professional Fee"), servicesItemsNode); - TreeNode addTimedServicesNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.InwardServicesAndItemsAddTimedServices, "Add Timed Services"), servicesItemsNode); - - TreeNode inwardBillingNode = new DefaultTreeNode("Billing", inwardNode); - TreeNode inwardBillingMenuNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.InwardBilling, "Billing Menu"), inwardBillingNode); - TreeNode interimBillNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.InwardBillingInterimBill, "Interim Bill"), inwardBillingNode); - TreeNode interimBillSearchNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.InwardBillingInterimBillSearch, "Interim Bill Search"), inwardBillingNode); - TreeNode editPatientNameAfterPaymentNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.InwardFinalBillReportEdit, "Edit Patient Name After Payment Finalized"), inwardBillingNode); - - TreeNode inwardPharmacyNode = new DefaultTreeNode("Pharmacy", inwardNode); - TreeNode inwardPharmacyMenuNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.InwardPharmacyMenu, "Pharmacy Menu"), inwardPharmacyNode); - TreeNode inwardPharmacyIssueRequestNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.InwardPharmacyIssueRequest, "Pharmacy Issue Request"), inwardPharmacyNode); - TreeNode inwardPharmacyIssueRequestSearchNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.InwardPharmacyIssueRequestSearch, "Pharmacy Issue Request Search"), inwardPharmacyNode); - - TreeNode searchNode = new DefaultTreeNode("Search", inwardNode); - TreeNode searchMenuNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.InwardSearch, "Search Menu"), searchNode); - TreeNode searchServiceBillNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.InwardSearchServiceBill, "Search Service Bill"), searchNode); - TreeNode searchProfessionalBillNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.InwardSearchProfessionalBill, "Search Professional Bill"), searchNode); - TreeNode searchFinalBillNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.InwardSearchFinalBill, "Search Final Bill"), searchNode); - - TreeNode inwardReportsNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.InwardReport, "Inward Reports"), inwardNode); - TreeNode administrationNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.InwardAdministration, "Administration"), inwardNode); - - TreeNode additionalPrivilegesNode = new DefaultTreeNode("Additional Privileges", inwardNode); - TreeNode additionalPrivilegeMenuNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.InwardAdditionalPrivilages, "Additional Privilege Menu"), additionalPrivilegesNode); - TreeNode searchBillsNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.InwardBillSearch, "Search Bills"), additionalPrivilegesNode); - TreeNode searchBillItemsNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.InwardBillItemSearch, "Search Bill Items"), additionalPrivilegesNode); - TreeNode reprintInwardNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.InwardBillReprint, "Reprint"), additionalPrivilegesNode); - TreeNode cancelInwardNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.InwardCancel, "Cancel"), additionalPrivilegesNode); - TreeNode returnInwardNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.InwardReturn, "Return"), additionalPrivilegesNode); - TreeNode reactivateInwardNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.InwardReactivate, "Reactivate"), additionalPrivilegesNode); - TreeNode showInwardFeeNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.ShowInwardFee, "Show Inward Fee"), additionalPrivilegesNode); - TreeNode inwardCheckNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.InwardCheck, "Inward Check"), additionalPrivilegesNode); - TreeNode inwardUncheckNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.InwardUnCheck, "Inward Uncheck"), additionalPrivilegesNode); - TreeNode inwardFinalBillCancelNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.InwardFinalBillCancel, "Inward Final Bill Cancel Without Check Date Range"), additionalPrivilegesNode); - TreeNode inwardOutsideMarkAsUnpaidNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.InwardOutSideMarkAsUnPaid, "Inward Outside Bill Mark as Un-Paid"), additionalPrivilegesNode); - TreeNode inwardBillSettleWithoutCheckNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.InwardBillSettleWithoutCheck, "Inward Bill Settle Without Check"), additionalPrivilegesNode); - + new DefaultTreeNode(new PrivilegeHolder(Privileges.Inward, "Inward Menu"), inwardNode); + TreeNode admissionsNode = new DefaultTreeNode(new PrivilegeHolder(null, "Admissions"), inwardNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.InwardAdmissions, "Admission Menu"), admissionsNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.InwardAdmissionsAdmission, "Admission"), admissionsNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.InwardAdmissionsEditAdmission, "Edit Admission Details"), admissionsNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.InwardAdmissionsInwardAppoinment, "Inward Appointment"), admissionsNode); + + TreeNode roomNode = new DefaultTreeNode(new PrivilegeHolder(null, "Room"), inwardNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.InwardRoom, "Room Menu"), roomNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.InwardRoomRoomOccupency, "Room Occupancy"), roomNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.InwardRoomRoomChange, "Room Change"), roomNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.InwardRoomGurdianRoomChange, "Guardian Room Change"), roomNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.InwardRoomDischarge, "Discharge Room"), roomNode); + + TreeNode servicesItemsNode = new DefaultTreeNode(new PrivilegeHolder(null, "Services & Items"), inwardNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.InwardServicesAndItems, "Services & Items Menu"), servicesItemsNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.InwardServicesAndItemsAddServices, "Add Services"), servicesItemsNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.InwardServicesAndItemsAddOutSideCharges, "Add Outside Charges"), servicesItemsNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.InwardServicesAndItemsAddProfessionalFee, "Add Professional Fee"), servicesItemsNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.InwardServicesAndItemsAddTimedServices, "Add Timed Services"), servicesItemsNode); + + TreeNode inwardBillingNode = new DefaultTreeNode(new PrivilegeHolder(null, "Billing"), inwardNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.InwardBilling, "Billing Menu"), inwardBillingNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.InwardBillingInterimBill, "Interim Bill"), inwardBillingNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.InwardBillingInterimBillSearch, "Interim Bill Search"), inwardBillingNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.InwardFinalBillReportEdit, "Edit Patient Name After Payment Finalized"), inwardBillingNode); + + TreeNode inwardPharmacyNode = new DefaultTreeNode(new PrivilegeHolder(null, "Pharmacy"), inwardNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.InwardPharmacyMenu, "Pharmacy Menu"), inwardPharmacyNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.InwardPharmacyIssueRequest, "Pharmacy Issue Request"), inwardPharmacyNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.InwardPharmacyIssueRequestSearch, "Pharmacy Issue Request Search"), inwardPharmacyNode); + + TreeNode searchNode = new DefaultTreeNode(new PrivilegeHolder(null, "Search"), inwardNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.InwardSearch, "Search Menu"), searchNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.InwardSearchServiceBill, "Search Service Bill"), searchNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.InwardSearchProfessionalBill, "Search Professional Bill"), searchNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.InwardSearchFinalBill, "Search Final Bill"), searchNode); + + new DefaultTreeNode(new PrivilegeHolder(Privileges.InwardReport, "Inward Reports"), inwardNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.InwardAdministration, "Administration"), inwardNode); + + TreeNode additionalPrivilegesNode = new DefaultTreeNode(new PrivilegeHolder(null, "Additional Privileges"), inwardNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.InwardAdditionalPrivilages, "Additional Privilege Menu"), additionalPrivilegesNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.InwardBillSearch, "Search Bills"), additionalPrivilegesNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.InwardBillItemSearch, "Search Bill Items"), additionalPrivilegesNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.InwardBillReprint, "Reprint"), additionalPrivilegesNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.InwardCancel, "Cancel"), additionalPrivilegesNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.InwardReturn, "Return"), additionalPrivilegesNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.InwardReactivate, "Reactivate"), additionalPrivilegesNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.ShowInwardFee, "Show Inward Fee"), additionalPrivilegesNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.InwardCheck, "Inward Check"), additionalPrivilegesNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.InwardUnCheck, "Inward Uncheck"), additionalPrivilegesNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.InwardFinalBillCancel, "Inward Final Bill Cancel"), additionalPrivilegesNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.InwardOutSideMarkAsUnPaid, "Inward Outside Mark As Unpaid"), additionalPrivilegesNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.InwardBillSettleWithoutCheck, "Inward Bill Settle Without Check"), additionalPrivilegesNode); + + // Theatre Privileges TreeNode theatreNode = new DefaultTreeNode(new PrivilegeHolder(null, "Theatre"), allNode); - TreeNode theatreMenuNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.Theatre, "Theatre Menu"), theatreNode); - TreeNode addSurgeryNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.TheatreAddSurgery, "Add Surgery"), theatreNode); - TreeNode theatreBillingNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.TheatreBilling, "Theatre Billing"), theatreNode); - TreeNode theatreTransferMenuItemNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.TheaterTransfer, "Theatre Transfer Menu Item"), theatreNode); - TreeNode theatreTransferRequestNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.TheaterTransferRequest, "Theatre Transfer Request"), theatreNode); - TreeNode theatreTransferIssueNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.TheaterTransferIssue, "Theatre Transfer Issue"), theatreNode); - TreeNode theatreTransferReceiveNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.TheaterTransferRecieve, "Theatre Transfer Receive"), theatreNode); - TreeNode theatreTransferReportNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.TheaterTransferReport, "Theatre Transfer Report"), theatreNode); - TreeNode theatreShowReportsMenuItemNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.TheaterReports, "Theatre Show Reports Menu Item"), theatreNode); - TreeNode theatreShowSummaryMenuItemNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.TheaterSummeries, "Theatre Show Summary Menu Item"), theatreNode); - - TreeNode theatreBHTIssueNode = new DefaultTreeNode("Theatre BHT Issue", theatreNode); - TreeNode theatreBHTIssueNodeChild = new DefaultTreeNode(new PrivilegeHolder(Privileges.TheaterIssue, "Theatre BHT Issue"), theatreBHTIssueNode); - TreeNode pharmacyBHTIssueNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.TheaterIssuePharmacy, "Pharmacy BHT Issue"), theatreBHTIssueNode); - TreeNode generalBHTIssueNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.TheaterIssueStore, "General BHT Issue"), theatreBHTIssueNode); - TreeNode inwardBHTBillingNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.TheaterIssueStoreBhtBilling, "Inward BHT Billing"), generalBHTIssueNode); - TreeNode searchBHTIssueBillNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.TheaterIssueStoreBhtSearchBill, "Search BHT Issue Bill"), generalBHTIssueNode); - TreeNode searchBHTIssueBillItemsNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.TheaterIssueStoreBhtSearchBillItem, "Search BHT Issue Bill Items"), generalBHTIssueNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.Theatre, "Theatre Menu"), theatreNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.TheatreAddSurgery, "Add Surgery"), theatreNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.TheatreBilling, "Theatre Billing"), theatreNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.TheaterTransfer, "Theatre Transfer Menu Item"), theatreNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.TheaterTransferRequest, "Theatre Transfer Request"), theatreNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.TheaterTransferIssue, "Theatre Transfer Issue"), theatreNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.TheaterTransferRecieve, "Theatre Transfer Receive"), theatreNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.TheaterTransferReport, "Theatre Transfer Report"), theatreNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.TheaterReports, "Theatre Show Reports Menu Item"), theatreNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.TheaterSummeries, "Theatre Show Summary Menu Item"), theatreNode); + + TreeNode theatreBHTIssueNode = new DefaultTreeNode(new PrivilegeHolder(null, "Theatre BHT Issue"), theatreNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.TheaterIssue, "Theatre BHT Issue"), theatreBHTIssueNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.TheaterIssuePharmacy, "Pharmacy BHT Issue"), theatreBHTIssueNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.TheaterIssueStore, "General BHT Issue"), theatreBHTIssueNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.TheaterIssueStoreBhtBilling, "Inward BHT Billing"), theatreBHTIssueNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.TheaterIssueStoreBhtSearchBill, "Search BHT Issue Bill"), theatreBHTIssueNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.TheaterIssueStoreBhtSearchBillItem, "Search BHT Issue Bill Items"), theatreBHTIssueNode); TreeNode opdIssueNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.TheaterIssueOpd, "Opd Issue"), theatreNode); - TreeNode opdIssueForCashierNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.TheaterIssueOpdForCasheir, "Opd Issue For Cashier"), opdIssueNode); - TreeNode opdIssueSearchPreBillNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.TheaterIssueOpdSearchPreBill, "Opd Issue Search Pre Bill"), opdIssueNode); - TreeNode opdIssueReturnItemOnlyNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.TheaterIssueOpdSearchPreBillForReturnItemOnly, "Opd Issue Return Item Only"), opdIssueNode); - TreeNode opdIssueSearchPreBillReturnNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.TheaterIssueOpdSearchPreBillReturn, "Opd Issue Search Pre Bill Return"), opdIssueNode); - TreeNode opdIssuePreBillAddToStockNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.TheaterIssueOpdSearchPreBillAddToStock, "Opd Issue Pre Bill Add To Stock"), opdIssueNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.TheaterIssueOpdForCasheir, "Opd Issue For Cashier"), opdIssueNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.TheaterIssueOpdSearchPreBill, "Opd Issue Search Pre Bill"), opdIssueNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.TheaterIssueOpdSearchPreBillForReturnItemOnly, "Opd Issue Return Item Only"), opdIssueNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.TheaterIssueOpdSearchPreBillReturn, "Opd Issue Search Pre Bill Return"), opdIssueNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.TheaterIssueOpdSearchPreBillAddToStock, "Opd Issue Pre Bill Add To Stock"), opdIssueNode); + // Lab Privileges TreeNode labNode = new DefaultTreeNode(new PrivilegeHolder(null, "Lab"), allNode); - TreeNode labMenuNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.Lab, "Lab Menu"), labNode); - TreeNode labBillingMenuNode = new DefaultTreeNode("Billing Menu", labNode); - TreeNode labBillNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.LabBilling, "Lab Bill"), labBillingMenuNode); - TreeNode labBillSearchNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.LabBillSearch, "Lab Bill Search"), labBillingMenuNode); - TreeNode labBillItemSearchNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.LabBillItemSearch, "Lab Bill Item Search"), labBillingMenuNode); - TreeNode labBillSearchCashierNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.LabBillSearchCashier, "Lab Bill Search"), labNode); - TreeNode labSearchBillsNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.LabBillSearch, "Search Bills"), labNode); - TreeNode labReportSearchNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.LabReportSearch, "Lab Report Search"), labNode); - TreeNode patientEditNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.LabEditPatient, "Patient Edit"), labNode); - TreeNode labBillReprintNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.LabBillReprint, "Lab Bill Reprint"), labNode); - TreeNode labBillReturnNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.LabBillReturning, "Lab Bill Return"), labNode); - TreeNode labBillCancelNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.LabBillCancelling, "Lab Bill Cancel"), labNode); - TreeNode ccBillCancelNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.CollectingCentreCancelling, "CC Bill Cancel"), labNode); - TreeNode labBillReactivateNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.LabBillReactivating, "Reactivate"), labNode); - TreeNode sampleCollectionNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.LabSampleCollecting, "Sample Collection"), labNode); - TreeNode sampleReceiveNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.LabSampleReceiving, "Sample Receive"), labNode); - TreeNode dataEntryNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.LabDataentry, "DataEntry"), labNode); - TreeNode authorizeNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.LabAutherizing, "Authorize"), labNode); - TreeNode deAuthorizeNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.LabDeAutherizing, "De-Authorize"), labNode); - TreeNode reportPrintNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.LabPrinting, "Report Print"), labNode); - TreeNode reportReprintNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.LabReprinting, "Report Reprint"), reportPrintNode); - TreeNode labReportFormatsEditingNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.LabReportFormatEditing, "Lab Report Formats Editing"), labNode); - TreeNode reportEditAfterAuthorizedNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.LabReportEdit, "Report Edit After Authorized"), labNode); - TreeNode labSummariesNode = new DefaultTreeNode("Lab Summaries", labNode); - TreeNode labSummariesMenuNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.LabSummeries, "Lab Summaries Menu"), labSummariesNode); - TreeNode labSummariesLevel1Node = new DefaultTreeNode(new PrivilegeHolder(Privileges.LabSummeriesLevel1, "Lab Summaries Level1"), labSummariesNode); - TreeNode labSummariesLevel2Node = new DefaultTreeNode(new PrivilegeHolder(Privileges.LabSummeriesLevel2, "Lab Summaries Level2"), labSummariesNode); - TreeNode labSummariesLevel3Node = new DefaultTreeNode(new PrivilegeHolder(Privileges.LabSummeriesLevel3, "Lab Summaries Level3"), labSummariesNode); - TreeNode labInvestigationFeeNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.LabInvestigationFee, "Lab Investigation Fees"), labNode); - TreeNode labBillCancelSpecialNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.LabBillCancelSpecial, "Lab Bill Cancel Special(after collecting sample can cancel)"), labNode); - TreeNode labBillRefundSpecialNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.LabBillRefundSpecial, "Lab Bill Refund Special(after collecting sample can Refund)"), labNode); - TreeNode addInwardServicesNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.LabAddInwardServices, "Add Inward Services"), labNode); - TreeNode searchByLoggedInstitutionNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.LabReportSearchByLoggedInstitution, "Search By Logged Institution"), labNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.Lab, "Lab Menu"), labNode); + TreeNode labBillingMenuNode = new DefaultTreeNode(new PrivilegeHolder(null, "Billing Menu"), labNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.LabBilling, "Lab Bill"), labBillingMenuNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.LabBillSearch, "Lab Bill Search"), labBillingMenuNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.LabBillItemSearch, "Lab Bill Item Search"), labBillingMenuNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.LabBillSearchCashier, "Lab Bill Search"), labNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.LabBillSearch, "Search Bills"), labNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.LabReportSearch, "Lab Report Search"), labNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.LabEditPatient, "Patient Edit"), labNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.LabBillReprint, "Lab Bill Reprint"), labNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.LabBillReturning, "Lab Bill Return"), labNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.LabBillCancelling, "Lab Bill Cancel"), labNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.CollectingCentreCancelling, "CC Bill Cancel"), labNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.LabBillReactivating, "Reactivate"), labNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.LabSampleCollecting, "Sample Collection"), labNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.LabSampleReceiving, "Sample Receive"), labNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.LabDataentry, "Data Entry"), labNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.LabAutherizing, "Authorize"), labNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.LabDeAutherizing, "De-Authorize"), labNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.LabPrinting, "Report Print"), labNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.LabReprinting, "Report Reprint"), labNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.LabReportFormatEditing, "Lab Report Formats Editing"), labNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.LabReportEdit, "Report Edit After Authorized"), labNode); + TreeNode labSummariesNode = new DefaultTreeNode(new PrivilegeHolder(null, "Lab Summaries"), labNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.LabSummeries, "Lab Summaries Menu"), labSummariesNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.LabSummeriesLevel1, "Lab Summaries Level 1"), labSummariesNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.LabSummeriesLevel2, "Lab Summaries Level 2"), labSummariesNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.LabSummeriesLevel3, "Lab Summaries Level 3"), labSummariesNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.LabInvestigationFee, "Lab Investigation Fees"), labNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.LabBillCancelSpecial, "Lab Bill Cancel Special"), labNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.LabBillRefundSpecial, "Lab Bill Refund Special"), labNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.LabAddInwardServices, "Add Inward Services"), labNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.LabReportSearchByLoggedInstitution, "Search By Logged Institution"), labNode); TreeNode labAdministrationNode = new DefaultTreeNode(new PrivilegeHolder(null, "Lab Administration"), labNode); - TreeNode labAdministrationMenuNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.LabAdiministrator, "Lab Administration Menu"), labAdministrationNode); - TreeNode manageItemsMenuNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.LabItems, "Manage Items Menu"), labAdministrationNode); - TreeNode manageItemFeeUpdateNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.LabItemFeeUpadate, "Manage Item Fee Update"), manageItemsMenuNode); - TreeNode manageItemFeeDeleteNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.LabItemFeeDelete, "Manage Item Fee Delete"), manageItemsMenuNode); - TreeNode manageReportsMenuNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.LabReports, "Manage Reports Menu"), labAdministrationNode); - TreeNode listsMenuNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.LabLists, "Lists Menu"), labAdministrationNode); - TreeNode setupMenuNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.LabSetUp, "Setup Menu"), labAdministrationNode); - TreeNode labInwardBillingMenuNode = new DefaultTreeNode("Lab Inward Billing Menu", labNode); - TreeNode labInwardBillNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.LabInwardBilling, "Lab Inward Bill"), labInwardBillingMenuNode); - TreeNode labInwardBillSearchNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.LabInwardSearchServiceBill, "Lab Inward Bill Search"), labInwardBillingMenuNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.LabAdiministrator, "Lab Administration Menu"), labAdministrationNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.LabItems, "Manage Items Menu"), labAdministrationNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.LabItemFeeUpadate, "Manage Item Fee Update"), labAdministrationNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.LabItemFeeDelete, "Manage Item Fee Delete"), labAdministrationNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.LabReports, "Manage Reports Menu"), labAdministrationNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.LabLists, "Lists Menu"), labAdministrationNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.LabSetUp, "Setup Menu"), labAdministrationNode); + TreeNode labInwardBillingMenuNode = new DefaultTreeNode(new PrivilegeHolder(null, "Lab Inward Billing Menu"), labNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.LabInwardBilling, "Lab Inward Bill"), labInwardBillingMenuNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.LabInwardSearchServiceBill, "Lab Inward Bill Search"), labInwardBillingMenuNode); TreeNode labCollectingCenterBillingNode = new DefaultTreeNode(new PrivilegeHolder(null, "Lab Collecting Center Billing"), labNode); - TreeNode labCollectingCenterMenuNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.LabCollectingCentreBilling, "Lab Collecting Center Menu"), labCollectingCenterBillingNode); - TreeNode labCCBillingNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.LabCCBilling, "Lab Collecting center Billing"), labCollectingCenterBillingNode); - TreeNode labCCBillingSearchNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.LabCCBillingSearch, "Lab Collecting Center Bill search"), labCollectingCenterBillingNode); - TreeNode labReportingNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.LabReporting, "Lab Reporting"), labNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.LabCollectingCentreBilling, "Lab Collecting Center Menu"), labCollectingCenterBillingNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.LabCCBilling, "Lab Collecting Center Billing"), labCollectingCenterBillingNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.LabCCBillingSearch, "Lab Collecting Center Bill Search"), labCollectingCenterBillingNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.LabReporting, "Lab Reporting"), labNode); + // Pharmacy Privileges TreeNode pharmacyNode = new DefaultTreeNode(new PrivilegeHolder(null, "Pharmacy"), allNode); - TreeNode pharmacyMenuNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.Pharmacy, "Pharmacy Menu"), pharmacyNode); - TreeNode pharmacyAdministrationNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.PharmacyAdministration, "Pharmacy Administration"), pharmacyNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.Pharmacy, "Pharmacy Menu"), pharmacyNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.PharmacyAdministration, "Pharmacy Administration"), pharmacyNode); + // Channelling Privileges TreeNode channellingNode = new DefaultTreeNode(new PrivilegeHolder(null, "Channelling"), allNode); - TreeNode channellingMenuNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.Channelling, "Channelling Menu"), channellingNode); - TreeNode channelBookingNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.ChannellingChannelBooking, "Channel Booking"), channellingNode); - TreeNode channelfutureBookingNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.ChannellingFutureChannelBooking, "Channel Future Booking"), channellingNode); - TreeNode channelpastBookingNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.ChannellingPastBooking, "Past Booking"), channellingNode); - TreeNode channelbookedListNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.ChannellingBookedList, "Booked List"), channellingNode); - TreeNode channeldoctorLeaveMenuNode = new DefaultTreeNode("Doctor Leave Menu", channellingNode); - TreeNode channeldoctorLeaveByDateNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.ChannellingDoctorLeaveByDate, "Doctor Leave By Date"), channeldoctorLeaveMenuNode); - TreeNode channeldoctorLeaveBySessionNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.ChannellingDoctorLeaveByServiceSession, "Doctor Leave By Service Session"), channeldoctorLeaveMenuNode); - TreeNode channelchannelSchedulingNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.ChannellingChannelSheduling, "Channel Scheduling"), channellingNode); - TreeNode channelSpecialchannelSchedulingNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.ChannellingSpecialChannelSheduling, "Special Channel Scheduling"), channellingNode); - TreeNode channelAgentFeeNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.ChannellingChannelAgentFee, "Channel Agent Fee"), channellingNode); - TreeNode channelBookingInterfaceNode = new DefaultTreeNode("Channel Booking Interface", channellingNode); - TreeNode channelbookingNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.ChannelBookingBokking, "Booking"), channelBookingInterfaceNode); - TreeNode channelreprintNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.ChannelBookingReprint, "Reprint"), channelBookingInterfaceNode); - TreeNode channelcancelNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.ChannelBookingCancel, "Cancel"), channelBookingInterfaceNode); - TreeNode channelrefundNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.ChannelBookingRefund, "Refund"), channelBookingInterfaceNode); - TreeNode channelsettleNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.ChannelBookingSettle, "Settle"), channelBookingInterfaceNode); - TreeNode channelchangeNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.ChannelBookingChange, "Change"), channelBookingInterfaceNode); - TreeNode channelsearchNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.ChannelBookingSearch, "Search"), channelBookingInterfaceNode); - TreeNode channelviewsNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.ChannelBookingViews, "Views"), channelBookingInterfaceNode); - TreeNode channeldoctorPaymentNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.ChannelBookingDocPay, "Doctor Payment"), channelBookingInterfaceNode); - TreeNode channelrestrictBookingNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.ChannelBookingRestric, "Restrict Channel Booking"), channelBookingInterfaceNode); - TreeNode channelprintPastBookingReceiptNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.ChannellingPrintInPastBooking, "Print Past Booking Receipt"), channellingNode); - TreeNode channelpaymentNode = new DefaultTreeNode("Payment", channellingNode); - TreeNode channelpaymentMenuNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.ChannellingPayment, "Payment Menu"), channelpaymentNode); - TreeNode channelpayDoctorNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.ChannellingPaymentPayDoctor, "Pay Doctor"), channelpaymentNode); - TreeNode channelpaymentDueSearchNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.ChannellingPaymentDueSearch, "Payment Due Search"), channelpaymentNode); - TreeNode channelpaymentDoneSearchNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.ChannellingPaymentDoneSearch, "Payment Done Search"), channelpaymentNode); - TreeNode channelcashierTransactionNode = new DefaultTreeNode("Cashier Transaction", channellingNode); - TreeNode channelcashierTransactionMenuNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.ChannelCashierTransaction, "Cashier Transaction Menu"), channelcashierTransactionNode); - TreeNode channelincomeNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.ChannelCashierTransactionIncome, "Income"), channelcashierTransactionNode); - TreeNode channelincomeSearchNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.ChannelCashierTransactionIncomeSearch, "Income Search"), channelcashierTransactionNode); - TreeNode channelexpensesNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.ChannelCashierTransactionExpencess, "Expenses"), channelcashierTransactionNode); - TreeNode channelexpensesSearchNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.ChannelCashierTransactionExpencessSearch, "Expenses Search"), channelcashierTransactionNode); - TreeNode channeladministratorNode = new DefaultTreeNode("Administrator", channellingNode); - TreeNode channeleditAppointmentCountNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.ChannellingApoinmentNumberCountEdit, "Edit Appointment Count"), channeladministratorNode); - TreeNode channeleditAppointmentNumberNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.ChannellingEditSerialNo, "Edit Appointment Number"), channeladministratorNode); - TreeNode channeleditPatientDetailsNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.ChannellingEditPatientDetails, "Edit Patient Details"), channeladministratorNode); - TreeNode channeldeleteScheduleNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.ChannellingChannelShedulRemove, "Delete Schedule"), channeladministratorNode); - TreeNode channeleditSessionNameNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.ChannellingChannelShedulName, "Edit Session Name"), channeladministratorNode); - TreeNode channeleditSessionStartingNoNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.ChannellingChannelShedulStartingNo, "Edit Session Starting No"), channeladministratorNode); - TreeNode channeleditSessionRoomNoNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.ChannellingChannelShedulRoomNo, "Edit Session Room No"), channeladministratorNode); - TreeNode channeleditSessionMaxRowNoNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.ChannellingChannelShedulMaxRowNo, "Edit Session Max Row No"), channeladministratorNode); - TreeNode channeleditCreditLimitUserLevelNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.ChannellingEditCreditLimitUserLevel, "Edit Credit Limit User Level"), channeladministratorNode); - TreeNode channeleditCreditLimitAdminLevelNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.ChannellingEditCreditLimitAdminLevel, "Edit Credit Limit Administrator Level"), channeladministratorNode); - TreeNode ChannellingReprintOriginalBill = new DefaultTreeNode(new PrivilegeHolder(Privileges.ChannellingReprintOriginalBill, "Channelling Reprint Original Bill"), channeladministratorNode); - TreeNode ChannellingPastBookingPatientAttend = new DefaultTreeNode(new PrivilegeHolder(Privileges.ChannellingPastBookingPatientAttend, "Channelling Attend Patients To Past Booking"), channeladministratorNode); - TreeNode channelReportsNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.ChannelReports, "Channel Reports"), channellingNode); - TreeNode channelSummaryNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.ChannelSummery, "Channel Summary"), channellingNode); - TreeNode channelManagementNode = new DefaultTreeNode("Channel Management", channellingNode); - TreeNode channelManagementMenuNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.ChannelManagement, "Channel Management Menu"), channelManagementNode); - TreeNode channelAgenciesNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.ChannelAgencyAgencies, "Channel Agencies"), channelManagementNode); - TreeNode channelAgencyCreditLimitUpdateNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.ChannelAgencyCreditLimitUpdate, "Channel Agency Credit Limit Update"), channelManagementNode); - TreeNode channelAgencyCreditLimitUpdateBulkNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.ChannelAgencyCreditLimitUpdateBulk, "Channel Agency Credit Limit Update (Bulk)"), channelManagementNode); - TreeNode addChannelBookToAgencyNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.ChannelAddChannelBookToAgency, "Add Channel Book To Agency"), channelManagementNode); - TreeNode manageSpecialitiesNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.ChannelManageSpecialities, "Channel Management Specialities"), channelManagementNode); - TreeNode manageConsultantsNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.ChannelManageConsultants, "Channel Management Consultants"), channelManagementNode); - TreeNode editingAppointmentCountNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.ChannelEditingAppoinmentCount, "Channel Editing Appointment Count"), channelManagementNode); - TreeNode addChannelingConsultantsToInstitutionNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.ChannelAddChannelingConsultantToInstitutions, "Add Channelling Consultants To Institution"), channelManagementNode); - TreeNode channelFeeUpdateNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.ChannelFeeUpdate, "Channel Fee Update"), channelManagementNode); - TreeNode channelCreditNoteNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.ChannelCrdeitNote, "Channel Credit Note"), channelManagementNode); - TreeNode channelCreditNoteSearchNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.ChannelCrdeitNoteSearch, "Channel Credit Note Search"), channelManagementNode); - TreeNode channelDebitNoteNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.ChannelDebitNote, "Channel Debit Note"), channelManagementNode); - TreeNode channelDebitNoteSearchNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.ChannelDebitNoteSearch, "Channel Debit Note Search"), channelManagementNode); - TreeNode channelCashCancelRestrictionNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.ChannelCashCancelRestriction, "Channel Cash Cancel Restriction"), channelManagementNode); - TreeNode channelActiveVatNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.ChannelActiveVat, "Channel Active Vat"), channelManagementNode); - - /////////////////// + new DefaultTreeNode(new PrivilegeHolder(Privileges.Channelling, "Channelling Menu"), channellingNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.ChannellingChannelBooking, "Channel Booking"), channellingNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.ChannellingFutureChannelBooking, "Channel Future Booking"), channellingNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.ChannellingPastBooking, "Past Booking"), channellingNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.ChannellingBookedList, "Booked List"), channellingNode); + TreeNode channelDoctorLeaveMenuNode = new DefaultTreeNode(new PrivilegeHolder(null, "Doctor Leave Menu"), channellingNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.ChannellingDoctorLeaveByDate, "Doctor Leave By Date"), channelDoctorLeaveMenuNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.ChannellingDoctorLeaveByServiceSession, "Doctor Leave By Service Session"), channelDoctorLeaveMenuNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.ChannellingChannelSheduling, "Channel Scheduling"), channellingNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.ChannellingSpecialChannelSheduling, "Special Channel Scheduling"), channellingNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.ChannellingChannelAgentFee, "Channel Agent Fee"), channellingNode); + TreeNode channelBookingInterfaceNode = new DefaultTreeNode(new PrivilegeHolder(null, "Channel Booking Interface"), channellingNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.ChannelBookingBokking, "Booking"), channelBookingInterfaceNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.ChannelBookingReprint, "Reprint"), channelBookingInterfaceNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.ChannelBookingCancel, "Cancel"), channelBookingInterfaceNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.ChannelBookingRefund, "Refund"), channelBookingInterfaceNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.ChannelBookingSettle, "Settle"), channelBookingInterfaceNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.ChannelBookingChange, "Change"), channelBookingInterfaceNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.ChannelBookingSearch, "Search"), channelBookingInterfaceNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.ChannelBookingViews, "Views"), channelBookingInterfaceNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.ChannelBookingDocPay, "Doctor Payment"), channelBookingInterfaceNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.ChannelBookingRestric, "Restrict Channel Booking"), channelBookingInterfaceNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.ChannellingPrintInPastBooking, "Print Past Booking Receipt"), channellingNode); + TreeNode channelPaymentNode = new DefaultTreeNode(new PrivilegeHolder(null, "Payment"), channellingNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.ChannellingPayment, "Payment Menu"), channelPaymentNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.ChannellingPaymentPayDoctor, "Pay Doctor"), channelPaymentNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.ChannellingPaymentDueSearch, "Payment Due Search"), channelPaymentNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.ChannellingPaymentDoneSearch, "Payment Done Search"), channelPaymentNode); + TreeNode channelCashierTransactionNode = new DefaultTreeNode(new PrivilegeHolder(null, "Cashier Transaction"), channellingNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.ChannelCashierTransaction, "Cashier Transaction Menu"), channelCashierTransactionNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.ChannelCashierTransactionIncome, "Income"), channelCashierTransactionNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.ChannelCashierTransactionIncomeSearch, "Income Search"), channelCashierTransactionNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.ChannelCashierTransactionExpencess, "Expenses"), channelCashierTransactionNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.ChannelCashierTransactionExpencessSearch, "Expenses Search"), channelCashierTransactionNode); + TreeNode channelAdministratorNode = new DefaultTreeNode(new PrivilegeHolder(null, "Administrator"), channellingNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.ChannellingApoinmentNumberCountEdit, "Edit Appointment Count"), channelAdministratorNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.ChannellingEditSerialNo, "Edit Appointment Number"), channelAdministratorNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.ChannellingEditPatientDetails, "Edit Patient Details"), channelAdministratorNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.ChannellingChannelShedulRemove, "Delete Schedule"), channelAdministratorNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.ChannellingChannelShedulName, "Edit Session Name"), channelAdministratorNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.ChannellingChannelShedulStartingNo, "Edit Session Starting No"), channelAdministratorNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.ChannellingChannelShedulRoomNo, "Edit Session Room No"), channelAdministratorNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.ChannellingChannelShedulMaxRowNo, "Edit Session Max Row No"), channelAdministratorNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.ChannellingEditCreditLimitUserLevel, "Edit Credit Limit User Level"), channelAdministratorNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.ChannellingEditCreditLimitAdminLevel, "Edit Credit Limit Administrator Level"), channelAdministratorNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.ChannellingReprintOriginalBill, "Channelling Reprint Original Bill"), channelAdministratorNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.ChannellingPastBookingPatientAttend, "Channelling Attend Patients To Past Booking"), channelAdministratorNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.ChannelReports, "Channel Reports"), channellingNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.ChannelSummery, "Channel Summary"), channellingNode); + TreeNode channelManagementNode = new DefaultTreeNode(new PrivilegeHolder(null, "Channel Management"), channellingNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.ChannelManagement, "Channel Management Menu"), channelManagementNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.ChannelAgencyAgencies, "Channel Agencies"), channelManagementNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.ChannelAgencyCreditLimitUpdate, "Channel Agency Credit Limit Update"), channelManagementNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.ChannelAgencyCreditLimitUpdateBulk, "Channel Agency Credit Limit Update (Bulk)"), channelManagementNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.ChannelAddChannelBookToAgency, "Add Channel Book To Agency"), channelManagementNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.ChannelManageSpecialities, "Channel Management Specialities"), channelManagementNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.ChannelManageConsultants, "Channel Management Consultants"), channelManagementNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.ChannelEditingAppoinmentCount, "Channel Editing Appointment Count"), channelManagementNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.ChannelAddChannelingConsultantToInstitutions, "Add Channelling Consultants To Institution"), channelManagementNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.ChannelFeeUpdate, "Channel Fee Update"), channelManagementNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.ChannelCrdeitNote, "Channel Credit Note"), channelManagementNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.ChannelCrdeitNoteSearch, "Channel Credit Note Search"), channelManagementNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.ChannelDebitNote, "Channel Debit Note"), channelManagementNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.ChannelDebitNoteSearch, "Channel Debit Note Search"), channelManagementNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.ChannelCashCancelRestriction, "Channel Cash Cancel Restriction"), channelManagementNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.ChannelActiveVat, "Channel Active Vat"), channelManagementNode); + + // Payment Privileges TreeNode paymentNode = new DefaultTreeNode(new PrivilegeHolder(null, "Payment"), allNode); - TreeNode paymentMenuNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.Payment, "Payment Menu"), paymentNode); - TreeNode staffPaymentNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.PaymentBilling, "Staff Payment Billing"), paymentNode); - TreeNode paymentSearchNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.PaymentBillSearch, "Payment Search"), paymentNode); - TreeNode paymentReprintsNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.PaymentBillReprint, "Payment Reprints"), paymentNode); - TreeNode paymentCancelNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.PaymentBillCancel, "Payment Cancel"), paymentNode); - TreeNode paymentRefundNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.PaymentBillRefund, "Payment Refund"), paymentNode); - TreeNode paymentReactivationNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.PaymentBillReactivation, "Payment Reactivation"), paymentNode); - TreeNode changeCreditLimit = new DefaultTreeNode(new PrivilegeHolder(Privileges.ChangeCreditLimitInCC, "Change Credit Limit in Collecting Centre"), paymentNode); - + new DefaultTreeNode(new PrivilegeHolder(Privileges.Payment, "Payment Menu"), paymentNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.PaymentBilling, "Staff Payment Billing"), paymentNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.PaymentBillSearch, "Payment Search"), paymentNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.PaymentBillReprint, "Payment Reprints"), paymentNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.PaymentBillCancel, "Payment Cancel"), paymentNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.PaymentBillRefund, "Payment Refund"), paymentNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.PaymentBillReactivation, "Payment Reactivation"), paymentNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.ChangeCreditLimitInCC, "Change Credit Limit in Collecting Centre"), paymentNode); + + // Reports Privileges TreeNode reportsNode = new DefaultTreeNode(new PrivilegeHolder(null, "Reports"), allNode); - TreeNode reportsMenuNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.Reports, "Reports Menu"), reportsNode); - TreeNode forOwnInstitutionNode = new DefaultTreeNode("For Own Institution", reportsNode); - TreeNode forAllInstitutionNode = new DefaultTreeNode("For All Institution", reportsNode); - - TreeNode cashCardBillReportsOwnNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.ReportsSearchCashCardOwn, "Cash/Card Bill Reports"), forOwnInstitutionNode); - TreeNode creditBillReportsOwnNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.ReportsSearchCreditOwn, "Credit Bill Reports"), forOwnInstitutionNode); - TreeNode itemReportsOwnNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.ReportsItemOwn, "Item Reports"), forOwnInstitutionNode); - - TreeNode cashCardBillReportsOtherNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.ReportsSearchCashCardOther, "Cash/Card Bill Reports"), forAllInstitutionNode); - TreeNode creditBillReportsOtherNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.ReportSearchCreditOther, "Credit Bill Reports"), forAllInstitutionNode); - TreeNode itemReportsOtherNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.ReportsItemOwn, "Item Reports"), forAllInstitutionNode); - + new DefaultTreeNode(new PrivilegeHolder(Privileges.Reports, "Reports Menu"), reportsNode); + TreeNode forOwnInstitutionNode = new DefaultTreeNode(new PrivilegeHolder(null, "For Own Institution"), reportsNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.ReportsSearchCashCardOwn, "Cash/Card Bill Reports"), forOwnInstitutionNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.ReportsSearchCreditOwn, "Credit Bill Reports"), forOwnInstitutionNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.ReportsItemOwn, "Item Reports"), forOwnInstitutionNode); + TreeNode forAllInstitutionNode = new DefaultTreeNode(new PrivilegeHolder(null, "For All Institution"), reportsNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.ReportsSearchCashCardOther, "Cash/Card Bill Reports"), forAllInstitutionNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.ReportSearchCreditOther, "Credit Bill Reports"), forAllInstitutionNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.ReportsItemOther, "Item Reports"), forAllInstitutionNode); + + // Clinical Privileges TreeNode clinicalsNode = new DefaultTreeNode(new PrivilegeHolder(null, "Clinicals"), allNode); - TreeNode clinicalDataNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.Clinical, "Clinical Data"), clinicalsNode); - TreeNode patientSummeryNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.ClinicalPatientSummery, "Patient Summary"), clinicalsNode); - TreeNode patientDetailsNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.ClinicalPatientDetails, "Patient Details"), clinicalsNode); - TreeNode patientPhotoNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.ClinicalPatientPhoto, "Patient Photo"), clinicalsNode); - TreeNode visitDetailsNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.ClinicalVisitDetail, "Visit Details"), clinicalsNode); - TreeNode visitSummeryNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.ClinicalVisitSummery, "Visit Summary"), clinicalsNode); - TreeNode historyNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.ClinicalHistory, "History"), clinicalsNode); - TreeNode clinicaladministrationNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.ClinicalAdministration, "Administration"), clinicalsNode); - TreeNode clinicalPatientDeleteNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.ClinicalPatientDelete, "Clinical Patient Delete"), clinicalsNode); - + new DefaultTreeNode(new PrivilegeHolder(Privileges.Clinical, "Clinical Data"), clinicalsNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.ClinicalPatientSummery, "Patient Summary"), clinicalsNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.ClinicalPatientDetails, "Patient Details"), clinicalsNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.ClinicalPatientPhoto, "Patient Photo"), clinicalsNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.ClinicalVisitDetail, "Visit Details"), clinicalsNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.ClinicalVisitSummery, "Visit Summary"), clinicalsNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.ClinicalHistory, "History"), clinicalsNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.ClinicalAdministration, "Administration"), clinicalsNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.ClinicalPatientDelete, "Clinical Patient Delete"), clinicalsNode); + + // Administration Privileges TreeNode adminNode = new DefaultTreeNode(new PrivilegeHolder(null, "Administration"), allNode); - TreeNode adminMenuNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.Admin, "Admin Menu"), adminNode); - TreeNode manageUsersNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.AdminManagingUsers, "Manage Users"), adminNode); - TreeNode manageInstitutionsNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.AdminInstitutions, "Manage Institutions"), adminNode); - TreeNode manageStaffNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.AdminStaff, "Manage Staff"), adminNode); - TreeNode manageItemsNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.AdminItems, "Manage Items/Services"), adminNode); - TreeNode manageFeesNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.AdminPrices, "Manage Fees/Prices/Packages"), adminNode); - TreeNode filterWithoutDepartmentNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.AdminFilterWithoutDepartment, "Filter Without Department"), adminNode); - TreeNode searchAllNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.SearchAll, "Search All"), adminNode); - TreeNode changeProfessionalFeeNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.ChangeProfessionalFee, "Change Professional Fee"), adminNode); - TreeNode changeCollectingCentreNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.ChangeCollectingCentre, "Change Collecting Centre"), adminNode); - TreeNode sendBulkSMSNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.SendBulkSMS, "Send Bulk SMS"), adminNode); - TreeNode onlyForDevelopersNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.Developers, "Only For Developers(Don't Add That)"), adminNode); - + new DefaultTreeNode(new PrivilegeHolder(Privileges.Admin, "Admin Menu"), adminNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.AdminManagingUsers, "Manage Users"), adminNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.AdminInstitutions, "Manage Institutions"), adminNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.AdminStaff, "Manage Staff"), adminNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.AdminItems, "Manage Items/Services"), adminNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.AdminPrices, "Manage Fees/Prices/Packages"), adminNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.AdminFilterWithoutDepartment, "Filter Without Department"), adminNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.SearchAll, "Search All"), adminNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.ChangeProfessionalFee, "Change Professional Fee"), adminNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.ChangeCollectingCentre, "Change Collecting Centre"), adminNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.SendBulkSMS, "Send Bulk SMS"), adminNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.Developers, "Only For Developers"), adminNode); + + // Membership Privileges TreeNode membershipNode = new DefaultTreeNode(new PrivilegeHolder(null, "Membership"), allNode); - TreeNode membershipMenuNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.MemberShip, "Membership Menu"), membershipNode); - TreeNode addMembersNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.MemberShipAdd, "Add Members"), membershipNode); - TreeNode editMembersNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.MemberShipEdit, "Edit Members"), membershipNode); - TreeNode membershipReportsNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.MembershipReports, "Membership Reports"), membershipNode); - TreeNode membershipDiscountManagementNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.MembershipDiscountManagement, "Membership Discount Management"), membershipNode); - TreeNode membershipAdministrationNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.MembershipAdministration, "Membership Administration"), membershipNode); - TreeNode otherNode = new DefaultTreeNode("Other", membershipNode); - - TreeNode membershipSchemesNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.MembershipSchemes, "Membership Schemes"), otherNode); - TreeNode inwardMembershipMenuNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.MemberShipInwardMemberShip, "Inward Membership Menu"), otherNode); - TreeNode schemesDiscountsNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.MemberShipInwardMemberShipSchemesDicounts, "Schemes Discounts"), otherNode); - TreeNode inwardMembershipReportNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.MemberShipInwardMemberShipInwardMemberShipReport, "Inward Membership Report"), otherNode); - TreeNode opdMembershipDisMenuNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.MemberShipOpdMemberShipDis, "Opd Membership Dis Menu"), otherNode); - TreeNode discountByDepartmentNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.MemberShipOpdMemberShipDisByDepartment, "Discount By Department"), otherNode); - TreeNode discountByCategoryNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.MemberShipOpdMemberShipDisByCategory, "Discount By Category"), otherNode); - TreeNode opdMembershipReportNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.MemberShipOpdMemberShipDisOpdMemberShipReport, "Opd Membership Report"), otherNode); - TreeNode reActivateRegisteredPatientNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.MemberShipMemberReActive, "Re-Activate Registered Patient"), otherNode); - TreeNode deActivateRegisteredPatientNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.MemberShipMemberDeActive, "De-Activate Registered Patient"), otherNode); - + new DefaultTreeNode(new PrivilegeHolder(Privileges.MemberShip, "Membership Menu"), membershipNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.MemberShipAdd, "Add Members"), membershipNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.MemberShipEdit, "Edit Members"), membershipNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.MembershipReports, "Membership Reports"), membershipNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.MembershipDiscountManagement, "Membership Discount Management"), membershipNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.MembershipAdministration, "Membership Administration"), membershipNode); + TreeNode otherNode = new DefaultTreeNode(new PrivilegeHolder(null, "Other"), membershipNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.MembershipSchemes, "Membership Schemes"), otherNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.MemberShipInwardMemberShip, "Inward Membership Menu"), otherNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.MemberShipInwardMemberShipSchemesDicounts, "Schemes Discounts"), otherNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.MemberShipInwardMemberShipInwardMemberShipReport, "Inward Membership Report"), otherNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.MemberShipOpdMemberShipDis, "Opd Membership Dis Menu"), otherNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.MemberShipOpdMemberShipDisByDepartment, "Discount By Department"), otherNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.MemberShipOpdMemberShipDisByCategory, "Discount By Category"), otherNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.MemberShipOpdMemberShipDisOpdMemberShipReport, "Opd Membership Report"), otherNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.MemberShipMemberReActive, "Re-Activate Registered Patient"), otherNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.MemberShipMemberDeActive, "De-Activate Registered Patient"), otherNode); + + // Human Resource Privileges TreeNode humanResourceNode = new DefaultTreeNode(new PrivilegeHolder(null, "Human Resource"), allNode); - TreeNode hrMenuNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.Hr, "HR Menu"), humanResourceNode); - TreeNode workingTimeNode = new DefaultTreeNode("Working Time", humanResourceNode); - TreeNode workingTimeMenuNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.HrWorkingTime, "Working Time Menu"), workingTimeNode); - TreeNode rosterTableNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.HrRosterTable, "Roster Table"), workingTimeNode); - TreeNode uploadAttendanceNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.HrUploadAttendance, "Upload Attendance"), workingTimeNode); - TreeNode analyseAttendanceByRosterNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.HrAnalyseAttendenceByRoster, "Analyse Attendance By Roster"), workingTimeNode); - TreeNode analyseAttendanceByStaffNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.HrAnalyseAttendenceByStaff, "Analyse Attendance By Staff"), workingTimeNode); - TreeNode formNode = new DefaultTreeNode("Form", humanResourceNode); - TreeNode formMenuNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.HrForms, "Form Menu"), formNode); - TreeNode leaveFormNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.HrLeaveForms, "Leave Form"), formNode); - TreeNode additionalFormNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.HrAdditionalForms, "Additional Form"), formNode); - TreeNode hrSalaryAdvanceNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.HrAdvanceSalary, "HR Salary Advance"), humanResourceNode); - TreeNode hrSalaryNode = new DefaultTreeNode("HR Salary", humanResourceNode); - TreeNode hrSalaryGenerateNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.HrGenerateSalary, "HR Salary Generate"), hrSalaryNode); - TreeNode hrSalaryGenerateSpecialNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.HrGenerateSalarySpecial, "HR Salary Generate Special"), hrSalaryNode); - TreeNode hrSalaryPrintNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.HrPrintSalary, "HR Salary Print"), humanResourceNode); - TreeNode hrReportsNode = new DefaultTreeNode("HR Reports", humanResourceNode); - TreeNode hrReportsMenuNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.HrReports, "HR Reports Menu"), hrReportsNode); - TreeNode hrReportsLevel1Node = new DefaultTreeNode(new PrivilegeHolder(Privileges.HrReportsLevel1, "HR Reports Level 1"), hrReportsNode); - TreeNode hrReportsLevel2Node = new DefaultTreeNode(new PrivilegeHolder(Privileges.HrReportsLevel2, "HR Reports Level 2"), hrReportsNode); - TreeNode hrReportsLevel3Node = new DefaultTreeNode(new PrivilegeHolder(Privileges.HrReportsLevel3, "HR Reports Level 3"), hrReportsNode); -// TreeNode employeeHistoryReportNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.EmployeeHistoryReport, "HR Employee History Reports"), hrReportsNode); - TreeNode hrAdministrationNode = new DefaultTreeNode("HR Administration", humanResourceNode); - TreeNode hrAdministrationMenuNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.HrAdmin, "HR Administration Menu"), hrAdministrationNode); - TreeNode hrDeleteLateLeaveNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.hrDeleteLateLeave, "HR Delete Late Leave"), hrAdministrationNode); - TreeNode hrEditRetiedDateNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.HrEditRetiedDate, "HR Edit Retied Date"), hrAdministrationNode); - TreeNode hrRemoveResignDateNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.HrRemoveResignDate, "HR Remove Resign Date"), hrAdministrationNode); - + new DefaultTreeNode(new PrivilegeHolder(Privileges.Hr, "HR Menu"), humanResourceNode); + TreeNode workingTimeNode = new DefaultTreeNode(new PrivilegeHolder(null, "Working Time"), humanResourceNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.HrWorkingTime, "Working Time Menu"), workingTimeNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.HrRosterTable, "Roster Table"), workingTimeNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.HrUploadAttendance, "Upload Attendance"), workingTimeNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.HrAnalyseAttendenceByRoster, "Analyse Attendance By Roster"), workingTimeNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.HrAnalyseAttendenceByStaff, "Analyse Attendance By Staff"), workingTimeNode); + TreeNode formNode = new DefaultTreeNode(new PrivilegeHolder(null, "Form"), humanResourceNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.HrForms, "Form Menu"), formNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.HrLeaveForms, "Leave Form"), formNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.HrAdditionalForms, "Additional Form"), formNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.HrAdvanceSalary, "HR Salary Advance"), humanResourceNode); + TreeNode hrSalaryNode = new DefaultTreeNode(new PrivilegeHolder(null, "HR Salary"), humanResourceNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.HrGenerateSalary, "HR Salary Generate"), hrSalaryNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.HrGenerateSalarySpecial, "HR Salary Generate Special"), hrSalaryNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.HrPrintSalary, "HR Salary Print"), humanResourceNode); + TreeNode hrReportsNode = new DefaultTreeNode(new PrivilegeHolder(null, "HR Reports"), humanResourceNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.HrReports, "HR Reports Menu"), hrReportsNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.HrReportsLevel1, "HR Reports Level 1"), hrReportsNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.HrReportsLevel2, "HR Reports Level 2"), hrReportsNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.HrReportsLevel3, "HR Reports Level 3"), hrReportsNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.HrAdmin, "HR Administration Menu"), humanResourceNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.hrDeleteLateLeave, "HR Delete Late Leave"), humanResourceNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.HrEditRetiedDate, "HR Edit Retired Date"), humanResourceNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.HrRemoveResignDate, "HR Remove Resign Date"), humanResourceNode); + + // Store Privileges TreeNode storeNode = new DefaultTreeNode(new PrivilegeHolder(null, "Store"), allNode); - TreeNode storeMenuNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.Store, "Store Menu"), storeNode); - TreeNode storeissueNode = new DefaultTreeNode("Issue", storeNode); - TreeNode storeissueMenuNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.StoreIssue, "Issue Menu"), storeissueNode); - TreeNode storeinwardBillingNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.StoreIssueInwardBilling, "Inward Billing"), storeissueNode); - TreeNode storesearchIssueBillNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.StoreIssueSearchBill, "Search Issue Bill"), storeissueNode); - TreeNode storesearchIssueBillItemsNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.StoreIssueBillItems, "Search Issue Bill Items"), storeissueNode); - TreeNode storepurchaseNode = new DefaultTreeNode("Purchase", storeNode); - TreeNode storepurchaseMenuNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.StorePurchase, "Purchase Menu"), storepurchaseNode); - TreeNode storepurchaseOrderNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.StorePurchaseOrder, "Purchase Order"), storepurchaseNode); - TreeNode storepoApproveNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.StorePurchaseOrderApprove, "PO Approve"), storepurchaseNode); - TreeNode storestoregrnReceiveNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.StorePurchaseGRNRecive, "GRN Receive"), storepurchaseNode); - TreeNode storestoregrnReturnNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.StorePurchaseGRNReturn, "GRN Return"), storepurchaseNode); - TreeNode storepurchasePurchaseNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.StorePurchasePurchase, "Purchase"), storepurchaseNode); - TreeNode storepoApproveSearchNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.StorePurchaseOrderApproveSearch, "PO Approve Search"), storepurchaseNode); - TreeNode storetransferNode = new DefaultTreeNode("Transfer", storeNode); - TreeNode storetransferMenuNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.StoreTransfer, "Transfer Menu"), storetransferNode); - TreeNode storetransferRequestNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.StoreTransferRequest, "Request"), storetransferNode); - TreeNode storetransferIssueNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.StoreTransferIssue, "Issue"), storetransferNode); - TreeNode storetransferReceiveNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.StoreTransferRecive, "Receive"), storetransferNode); - TreeNode storetransferReportNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.StoreTransferReport, "Report"), storetransferNode); - TreeNode storeadjustmentNode = new DefaultTreeNode("Adjustment", storeNode); - TreeNode storeadjustmentMenuNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.StoreAdjustment, "Adjustment Menu"), storeadjustmentNode); - TreeNode storedepartmentStockNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.StoreAdjustmentDepartmentStock, "Department Stock(Qty)"), storeadjustmentNode); - TreeNode storestaffStockAdjustmentNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.StoreAdjustmentStaffStock, "Staff Stock Adjustment"), storeadjustmentNode); - TreeNode storepurchaseRateNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.StoreAdjustmentPurchaseRate, "Purchase Rate"), storeadjustmentNode); - TreeNode storesaleRateNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.StoreAdjustmentSaleRate, "Sale Rate"), storeadjustmentNode); - TreeNode storedelorPaymentNode = new DefaultTreeNode("Delor Payment", storeNode); - TreeNode storedelorPaymentMenuNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.StoreDealorPayment, "Delor Payment Menu"), storedelorPaymentNode); - TreeNode storedelorDueSearchNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.StoreDealorPaymentDueSearch, "Delor Due Search"), storedelorPaymentNode); - TreeNode storedelorDueByAgeNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.StoreDealorPaymentDueByAge, "Delor Due By Age"), storedelorPaymentNode); - TreeNode storepaymentNode = new DefaultTreeNode("Payment", storedelorPaymentNode); - TreeNode storepaymentMenuNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.StoreDealorPaymentPayment, "Payment Menu"), storepaymentNode); - TreeNode storegrnPaymentNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.StoreDealorPaymentPaymentGRN, "GRN Payment"), storepaymentNode); - TreeNode storegrnPaymentSelectNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.StoreDealorPaymentPaymentGRNSelect, "GRN Payment(Select)"), storepaymentNode); - TreeNode storegrnPaymentDueSearchNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.StoreDealorPaymentGRNDoneSearch, "GRN Payment Due Search"), storedelorPaymentNode); - TreeNode storesearchNode = new DefaultTreeNode("Search", storeNode); - TreeNode storesearchMenuNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.StoreSearch, "Search Menu"), storesearchNode); - TreeNode storereportNode = new DefaultTreeNode("Report", storeNode); - TreeNode storereportMenuNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.StoreReports, "Report Menu"), storereportNode); - TreeNode storesummaryNode = new DefaultTreeNode("Summary", storeNode); - TreeNode storesummaryMenuNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.StoreSummery, "Summary Menu"), storesummaryNode); - TreeNode storeadministrationNode = new DefaultTreeNode("Administration", storeNode); - TreeNode storeadministrationMenuNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.StoreAdministration, "Administration Menu"), storeadministrationNode); - + new DefaultTreeNode(new PrivilegeHolder(Privileges.Store, "Store Menu"), storeNode); + TreeNode storeIssueNode = new DefaultTreeNode(new PrivilegeHolder(null, "Issue"), storeNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.StoreIssue, "Issue Menu"), storeIssueNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.StoreIssueInwardBilling, "Inward Billing"), storeIssueNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.StoreIssueSearchBill, "Search Issue Bill"), storeIssueNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.StoreIssueBillItems, "Search Issue Bill Items"), storeIssueNode); + TreeNode storePurchaseNode = new DefaultTreeNode(new PrivilegeHolder(null, "Purchase"), storeNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.StorePurchase, "Purchase Menu"), storePurchaseNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.StorePurchaseOrder, "Purchase Order"), storePurchaseNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.StorePurchaseOrderApprove, "PO Approve"), storePurchaseNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.StorePurchaseGRNRecive, "GRN Receive"), storePurchaseNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.StorePurchaseGRNReturn, "GRN Return"), storePurchaseNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.StorePurchasePurchase, "Purchase"), storePurchaseNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.StorePurchaseOrderApproveSearch, "PO Approve Search"), storePurchaseNode); + TreeNode storeTransferNode = new DefaultTreeNode(new PrivilegeHolder(null, "Transfer"), storeNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.StoreTransfer, "Transfer Menu"), storeTransferNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.StoreTransferRequest, "Request"), storeTransferNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.StoreTransferIssue, "Issue"), storeTransferNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.StoreTransferRecive, "Receive"), storeTransferNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.StoreTransferReport, "Report"), storeTransferNode); + TreeNode storeAdjustmentNode = new DefaultTreeNode(new PrivilegeHolder(null, "Adjustment"), storeNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.StoreAdjustment, "Adjustment Menu"), storeAdjustmentNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.StoreAdjustmentDepartmentStock, "Department Stock (Qty)"), storeAdjustmentNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.StoreAdjustmentStaffStock, "Staff Stock Adjustment"), storeAdjustmentNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.StoreAdjustmentPurchaseRate, "Purchase Rate"), storeAdjustmentNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.StoreAdjustmentSaleRate, "Sale Rate"), storeAdjustmentNode); + TreeNode storeDealorPaymentNode = new DefaultTreeNode(new PrivilegeHolder(null, "Delor Payment"), storeNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.StoreDealorPayment, "Delor Payment Menu"), storeDealorPaymentNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.StoreDealorPaymentDueSearch, "Delor Due Search"), storeDealorPaymentNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.StoreDealorPaymentDueByAge, "Delor Due By Age"), storeDealorPaymentNode); + TreeNode storePaymentNode = new DefaultTreeNode(new PrivilegeHolder(null, "Payment"), storeDealorPaymentNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.StoreDealorPaymentPayment, "Payment Menu"), storePaymentNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.StoreDealorPaymentPaymentGRN, "GRN Payment"), storePaymentNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.StoreDealorPaymentPaymentGRNSelect, "GRN Payment (Select)"), storePaymentNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.StoreDealorPaymentGRNDoneSearch, "GRN Payment Due Search"), storeDealorPaymentNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.StoreSearch, "Search Menu"), storeNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.StoreReports, "Report Menu"), storeNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.StoreSummery, "Summary Menu"), storeNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.StoreAdministration, "Administration Menu"), storeNode); + + TreeNode courierNode = new DefaultTreeNode(new PrivilegeHolder(null, "Courier"), allNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.CourierCollectSamples, "Courier Collect Samples"), courierNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.CourierHandoverSamplesToLab, "Courier Handover Samples to Lab"), courierNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.CourierViewReports, "Courier View Reports"), courierNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.CourierPrintReports, "Courier Print Reports"), courierNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.CourierViewStatistics, "Courier View Statistics"), courierNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.CourierViewBillReports, "Courier View Bill Reports"), courierNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.CourierViewPaymentReports, "Courier View Payment Reports"), courierNode); + + // Search Privileges TreeNode searchRootNode = new DefaultTreeNode(new PrivilegeHolder(null, "Search"), allNode); - TreeNode searchMenuRootNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.Search, "Search Menu"), searchRootNode); - TreeNode grandSearchNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.SearchGrand, "Grand Search"), searchRootNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.Search, "Search Menu"), searchRootNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.SearchGrand, "Grand Search"), searchRootNode); + // User Privileges TreeNode userNode = new DefaultTreeNode(new PrivilegeHolder(null, "User"), allNode); - TreeNode changeThemeNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.ChangePreferece, "Change Theme"), userNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.ChangePreferece, "Change Theme"), userNode); + // Cash Transaction Privileges TreeNode cashTransactionNode = new DefaultTreeNode(new PrivilegeHolder(null, "Cash Transaction"), allNode); - TreeNode cashTransactionMenuNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.CashTransaction, "Cash Transaction Menu"), cashTransactionNode); - TreeNode cashInNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.CashTransactionCashIn, "Cash In"), cashTransactionNode); - TreeNode cashOutNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.CashTransactionCashOut, "Cash Out"), cashTransactionNode); - TreeNode listToCashReceiveNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.CashTransactionListToCashRecieve, "List To Cash Receive"), cashTransactionNode); - - //Pharmacy - TreeNode retailTransaction = new DefaultTreeNode("Pharmacy Retail Transaction", pharmacyNode); - TreeNode retailTransactionMenu = new DefaultTreeNode(new PrivilegeHolder(Privileges.PharmacyRetailTransactionMenue, "Pharmacy Retail Transaction Menu"), retailTransaction); - TreeNode PharmacySale = new DefaultTreeNode(new PrivilegeHolder(Privileges.PharmacySale, "Pharmacy Sale"), retailTransaction); - TreeNode PharmacySaleForCashier = new DefaultTreeNode(new PrivilegeHolder(Privileges.PharmacySaleForCashier, "Pharmacy Sale For Cashier"), retailTransaction); - TreeNode PharmacySaleWithOutStock = new DefaultTreeNode(new PrivilegeHolder(Privileges.PharmacySaleWithOutStock, "Pharmacy Sale With Out Stock"), retailTransaction); - TreeNode PharmacySearchSaleBill = new DefaultTreeNode(new PrivilegeHolder(Privileges.PharmacySearchSaleBill, "Pharmacy Search Sale Bill"), retailTransaction); - TreeNode PharmacySearchSalePreBill = new DefaultTreeNode(new PrivilegeHolder(Privileges.PharmacySearchSalePreBill, "Pharmacy Search Sale PreBill"), retailTransaction); - TreeNode PharmacySearchSaleBillItems = new DefaultTreeNode(new PrivilegeHolder(Privileges.PharmacySearchSaleBillItems, "Pharmacy Search Sale BillItems"), retailTransaction); - TreeNode PharmacyReturnItemsOnly = new DefaultTreeNode(new PrivilegeHolder(Privileges.PharmacyReturnItemsOnly, "Pharmacy Return Items Only"), retailTransaction); - TreeNode PharmacyReturnItemsAndPayments = new DefaultTreeNode(new PrivilegeHolder(Privileges.PharmacyReturnItemsAndPayments, "Pharmacy Return Items And Payments"), retailTransaction); - TreeNode PharmacySearchReturnBill = new DefaultTreeNode(new PrivilegeHolder(Privileges.PharmacySearchReturnBill, "Pharmacy Search ReturnBill"), retailTransaction); - TreeNode PharmacySaleCancel = new DefaultTreeNode(new PrivilegeHolder(Privileges.PharmacySaleCancel, "Pharmacy Sale Bill Cancel"), retailTransaction); - TreeNode PharmacyAddToStock = new DefaultTreeNode(new PrivilegeHolder(Privileges.PharmacyAddToStock, "Pharmacy Add To Stock"), retailTransaction); - - TreeNode PharmacyWholeSaleTransAction = new DefaultTreeNode("Pharmacy Wholesale Transaction", pharmacyNode); - TreeNode PharmacyWholeSaleTransactionMenue = new DefaultTreeNode(new PrivilegeHolder(Privileges.PharmacyWholeSaleTransactionMenue, "Procurement Menu"), PharmacyWholeSaleTransAction); - TreeNode PharmacyWholesaleSale = new DefaultTreeNode(new PrivilegeHolder(Privileges.PharmacyWholesaleSale, "Pharmacy Wholesale Sale"), PharmacyWholeSaleTransAction); - TreeNode PharmacyWholesaleSaleForCashier = new DefaultTreeNode(new PrivilegeHolder(Privileges.PharmacyWholesaleSaleForCashier, "Pharmacy Wholesale Sale For Cashier"), PharmacyWholeSaleTransAction); - TreeNode PharmacyWholesaleSearchSaleBill = new DefaultTreeNode(new PrivilegeHolder(Privileges.PharmacyWholesaleSearchSaleBill, "Pharmacy Wholesale Search Sale Bill"), PharmacyWholeSaleTransAction); - TreeNode PharmacyWholesaleSearchSaleBillToPay = new DefaultTreeNode(new PrivilegeHolder(Privileges.PharmacyWholesaleSearchSaleBillToPay, "Pharmacy Wholesale Search Sale Bill To Pay"), PharmacyWholeSaleTransAction); - TreeNode PharmacyWholesaleSearchSaleBillItems = new DefaultTreeNode(new PrivilegeHolder(Privileges.PharmacyWholesaleSearchSaleBillItems, "Pharmacy Wholesale Search Sale Bill Items"), PharmacyWholeSaleTransAction); - TreeNode PharmacyWholesaleReturnItemsOnly = new DefaultTreeNode(new PrivilegeHolder(Privileges.PharmacyWholesaleReturnItemsOnly, "Pharmacy Wholesale Return Items Only"), PharmacyWholeSaleTransAction); - TreeNode PharmacyWholesaleWholeSaleAddToStock = new DefaultTreeNode(new PrivilegeHolder(Privileges.PharmacyWholesaleWholeSaleAddToStock, "Pharmacy WholeSale Add To Stock"), PharmacyWholeSaleTransAction); - TreeNode PharmacyWholeSalePurchase = new DefaultTreeNode(new PrivilegeHolder(Privileges.PharmacyWholeSalePurchase, "Pharmacy Whole Sale Purchase"), PharmacyWholeSaleTransAction); - TreeNode PharmacySearchReturnBillItems = new DefaultTreeNode(new PrivilegeHolder(Privileges.PharmacySearchReturnBillItems, "Pharmacy Search Return Bill Items"), PharmacyWholeSaleTransAction); - - TreeNode disbursementNode = new DefaultTreeNode("Pharmacy Disbursement", pharmacyNode); - TreeNode disbursementMenue = new DefaultTreeNode(new PrivilegeHolder(Privileges.PharmacyDisburesementMenu, "Pharmacy Disburesement Menu"), disbursementNode); - TreeNode disbursementRequest = new DefaultTreeNode(new PrivilegeHolder(Privileges.PharmacyDisbursementRequest, "Request"), disbursementNode); - TreeNode disbursementIssueForRequest = new DefaultTreeNode(new PrivilegeHolder(Privileges.PharmacyDisbursementIssurForRequest, "Issue for Request"), disbursementNode); - TreeNode disbursementDirectIssue = new DefaultTreeNode(new PrivilegeHolder(Privileges.PharmacyDisbursementDirectIssue, "Direct Issue"), disbursementNode); - TreeNode disbursementRecieve = new DefaultTreeNode(new PrivilegeHolder(Privileges.PharmacyDisbursementRecieve, "Recieve"), disbursementNode); - TreeNode TransferReciveApproval = new DefaultTreeNode(new PrivilegeHolder(Privileges.TransferReciveApproval, "Recieve Approval"), disbursementNode); - TreeNode PharmacyDisbursementReports = new DefaultTreeNode(new PrivilegeHolder(Privileges.PharmacyDisbursementReports, "Pharmacy Disbursement Reports"), disbursementNode); - - TreeNode InpatientMedicationManagementNode = new DefaultTreeNode("Inpatient medication Management", pharmacyNode); - TreeNode InpatientMedicationManagementMenue = new DefaultTreeNode(new PrivilegeHolder(Privileges.InpatientMedicationManagementMenue, "Procurement Menu"), InpatientMedicationManagementNode); - TreeNode PharmacyDirectIssueToBht = new DefaultTreeNode(new PrivilegeHolder(Privileges.PharmacyDirectIssueToBht, "Pharmacy Direct Issue To Bht"), InpatientMedicationManagementNode); - TreeNode PharmacyDirectIssueToTheaterCases = new DefaultTreeNode(new PrivilegeHolder(Privileges.PharmacyDirectIssueToTheaterCases, "Pharmacy Direct Issue To Theater Cases"), InpatientMedicationManagementNode); - TreeNode PharmacyBhtIssueRequest = new DefaultTreeNode(new PrivilegeHolder(Privileges.PharmacyBhtIssueRequest, "Pharmacy Bht Issue Request"), InpatientMedicationManagementNode); - TreeNode PharmacySearchInpatientDirectIssuesbyBill = new DefaultTreeNode(new PrivilegeHolder(Privileges.PharmacySearchInpatientDirectIssuesbyBill, "Pharmacy Search Inpatient Direct Issues by Bill"), InpatientMedicationManagementNode); - TreeNode PharmacySearchInpatientDirectIssuesbyItem = new DefaultTreeNode(new PrivilegeHolder(Privileges.PharmacySearchInpatientDirectIssuesbyItem, "Pharmacy Search Inpatient Direct Issues by Item"), InpatientMedicationManagementNode); - TreeNode PharmacySearchInpatientDirectIssueReturnsbyBill = new DefaultTreeNode(new PrivilegeHolder(Privileges.PharmacySearchInpatientDirectIssueReturnsbyBill, "Pharmacy Search Inpatient Direct Issue Returns by Bill"), InpatientMedicationManagementNode); - TreeNode PharmacysSearchInpatientDirectIssueReturnsbyItem = new DefaultTreeNode(new PrivilegeHolder(Privileges.PharmacysSearchInpatientDirectIssueReturnsbyItem, "Pharmacy Search Inpatient Direct Issue Returns by Item"), InpatientMedicationManagementNode); - - TreeNode ProcumentNode = new DefaultTreeNode("Pharmacy Procument", pharmacyNode); - TreeNode pharmacyProcurementMenu = new DefaultTreeNode(new PrivilegeHolder(Privileges.PharmacyProcurementMenu, "Procurement Menu"), ProcumentNode); - TreeNode pharmacyCreatePurchaseOrder = new DefaultTreeNode(new PrivilegeHolder(Privileges.CreatePurchaseOrder, "Create Purchase Order"), ProcumentNode); - TreeNode pharmacyAutoOrderPModel = new DefaultTreeNode(new PrivilegeHolder(Privileges.AutoOrderPModel, "Auto Order (P Model)"), ProcumentNode); - TreeNode pharmacyAutoOrderQModel = new DefaultTreeNode(new PrivilegeHolder(Privileges.AutoOrderQModal, "Auto Order (Q Model)"), ProcumentNode); - TreeNode pharmacyDirectPurchase = new DefaultTreeNode(new PrivilegeHolder(Privileges.DirectPurchase, "Direct Purchase"), ProcumentNode); - TreeNode pharmacyPurchaseOrderApprovel = new DefaultTreeNode(new PrivilegeHolder(Privileges.PurchaseOrdersApprovel, "Purchase Orders Approvel"), ProcumentNode); - TreeNode pharmacyGoodRecipt = new DefaultTreeNode(new PrivilegeHolder(Privileges.GoodsRecipt, "Pharmacy Good Recipt"), ProcumentNode); - TreeNode pharmacyReturnReceviedGoods = new DefaultTreeNode(new PrivilegeHolder(Privileges.ReturnReceviedGoods, "Pharmacy Return Recevied Goods"), ProcumentNode); - TreeNode pharmacyReturnWithoutRecipt = new DefaultTreeNode(new PrivilegeHolder(Privileges.ReturnWithoutRecipt, "Pharmacy Return WIthout Recipt"), ProcumentNode); - TreeNode pharmacyOrderCancellation = new DefaultTreeNode(new PrivilegeHolder(Privileges.PharmacyOrderCancellation, "Pharmacy Order Cancellation"), ProcumentNode); - - TreeNode DealerPayment = new DefaultTreeNode("Pharmacy Dealer Payment", pharmacyNode); - TreeNode PharmacyDealerPaymentMenue = new DefaultTreeNode(new PrivilegeHolder(Privileges.PharmacyDealerPaymentMenue, "Pharmacy Dealer Payment Menue"), DealerPayment); - TreeNode PharmacyDealerDueSearch = new DefaultTreeNode(new PrivilegeHolder(Privileges.PharmacyDealerDueSearch, "Pharmacy Dealer Due Search"), DealerPayment); - TreeNode PharmacyDealerDueByAge = new DefaultTreeNode(new PrivilegeHolder(Privileges.PharmacyDealerDueByAge, "Pharmacy Dealer Due By Age"), DealerPayment); - TreeNode PharmacyPayment = new DefaultTreeNode(new PrivilegeHolder(Privileges.PharmacyPayment, "Pharmacy Payment"), DealerPayment); - TreeNode PharmacyGRNPaymentApprove = new DefaultTreeNode(new PrivilegeHolder(Privileges.PharmacyGRNPaymentApprove, "Pharmacy GRN Payment Approve"), DealerPayment); - TreeNode PharmacyGRNPaymentDoneSearch = new DefaultTreeNode(new PrivilegeHolder(Privileges.PharmacyGRNPaymentDoneSearch, "Pharmacy GRN Payment Done Search"), DealerPayment); - TreeNode PharmacyCreditDueAndAccess = new DefaultTreeNode(new PrivilegeHolder(Privileges.PharmacyCreditDueAndAccess, "Pharmacy Credit Du eAnd Access"), DealerPayment); - - TreeNode PharmacyAdjustment = new DefaultTreeNode("Pharmacy Adjustment", pharmacyNode); - TreeNode pharmacyPharmacyAdjustmentMenue = new DefaultTreeNode(new PrivilegeHolder(Privileges.PharmacyAdjustmentMenue, "Pharmacy Adjustment Menu"), PharmacyAdjustment); - TreeNode PharmacyAdjustmentDepartmentStockQTY = new DefaultTreeNode(new PrivilegeHolder(Privileges.PharmacyAdjustmentDepartmentStockQTY, "Pharmacy Adjustment Department Stock QTY"), PharmacyAdjustment); - TreeNode PharmacyAdjustmentDepartmentStockBySingleItemQTY = new DefaultTreeNode(new PrivilegeHolder(Privileges.PharmacyAdjustmentDepartmentStockBySingleItemQTY, "Pharmacy Adjustment Department Stock By Single Item QTY"), PharmacyAdjustment); - TreeNode PharmacyAdjustmentStaffStockAdjustment = new DefaultTreeNode(new PrivilegeHolder(Privileges.PharmacyAdjustmentStaffStockAdjustment, "Pharmacy Adjustment Staff Stock Adjustment"), PharmacyAdjustment); - TreeNode PharmacyAdjustmentPurchaseRate = new DefaultTreeNode(new PrivilegeHolder(Privileges.PharmacyAdjustmentPurchaseRate, "Pharmacy Adjustment Purchase Rate"), PharmacyAdjustment); - TreeNode PharmacyAdjustmentSaleRate = new DefaultTreeNode(new PrivilegeHolder(Privileges.PharmacyAdjustmentSaleRate, "Pharmacy Adjustment Sale Rate"), PharmacyAdjustment); - TreeNode PharmacyAdjustmentWholeSaleRate = new DefaultTreeNode(new PrivilegeHolder(Privileges.PharmacyAdjustmentWholeSaleRate, "Pharmacy Adjustment Wholesale Rate"), PharmacyAdjustment); - TreeNode PharmacyAdjustmentExpiaryDate = new DefaultTreeNode(new PrivilegeHolder(Privileges.PharmacyAdjustmentExpiryDate, "Pharmacy Adjustment Expiary Date"), PharmacyAdjustment); - TreeNode PharmacyAdjustmentReports = new DefaultTreeNode(new PrivilegeHolder(Privileges.PharmacyAdjustmentSearchAdjustmentBills, "Pharmacy Adjustment Search Adjustment Bills"), PharmacyAdjustment); - - TreeNode PharmacyDisposal = new DefaultTreeNode("Pharmacy Disposal", pharmacyNode); - TreeNode pharmacyDisposalMenu = new DefaultTreeNode(new PrivilegeHolder(Privileges.PharmacyDisposalMenue, "Pharmacy Disposal Menue"), PharmacyDisposal); - TreeNode PharmacyDisposalIssue = new DefaultTreeNode(new PrivilegeHolder(Privileges.PharmacyDisposalIssue, "Pharmacy Disposal Issue"), PharmacyDisposal); - TreeNode PharmacyDisposalSearchIssueBill = new DefaultTreeNode(new PrivilegeHolder(Privileges.PharmacyDisposalSearchIssueBill, "Pharmacy Disposal Search Issue Bill"), PharmacyDisposal); - TreeNode PharmacyDisposalSearchIssueBillItems = new DefaultTreeNode(new PrivilegeHolder(Privileges.PharmacyDisposalSearchIssueBillItems, "Pharmacy Disposal Search Issue Return Bill"), PharmacyDisposal); - TreeNode PharmacyDisposalSearchIssueReturnBill = new DefaultTreeNode(new PrivilegeHolder(Privileges.PharmacyDisposalSearchIssueReturnBill, "Pharmacy Adjustment Purchase Rate"), PharmacyDisposal); - TreeNode PharmacyDisposalUnitIssueMargin = new DefaultTreeNode(new PrivilegeHolder(Privileges.PharmacyDisposalUnitIssueMargin, "Pharmacy Disposal Unit Issue Margin"), PharmacyDisposal); - - // Adding Optician node and subnodes + new DefaultTreeNode(new PrivilegeHolder(Privileges.CashTransaction, "Cash Transaction Menu"), cashTransactionNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.CashTransactionCashIn, "Cash In"), cashTransactionNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.CashTransactionCashOut, "Cash Out"), cashTransactionNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.CashTransactionListToCashRecieve, "List To Cash Receive"), cashTransactionNode); + + // Pharmacy Retail Transaction Privileges + TreeNode retailTransaction = new DefaultTreeNode(new PrivilegeHolder(null, "Pharmacy Retail Transaction"), pharmacyNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.PharmacyRetailTransactionMenue, "Pharmacy Retail Transaction Menu"), retailTransaction); + new DefaultTreeNode(new PrivilegeHolder(Privileges.PharmacySale, "Pharmacy Sale"), retailTransaction); + new DefaultTreeNode(new PrivilegeHolder(Privileges.PharmacySaleForCashier, "Pharmacy Sale For Cashier"), retailTransaction); + new DefaultTreeNode(new PrivilegeHolder(Privileges.PharmacySaleWithOutStock, "Pharmacy Sale Without Stock"), retailTransaction); + new DefaultTreeNode(new PrivilegeHolder(Privileges.PharmacySearchSaleBill, "Pharmacy Search Sale Bill"), retailTransaction); + new DefaultTreeNode(new PrivilegeHolder(Privileges.PharmacySearchSalePreBill, "Pharmacy Search Sale PreBill"), retailTransaction); + new DefaultTreeNode(new PrivilegeHolder(Privileges.PharmacySearchSaleBillItems, "Pharmacy Search Sale Bill Items"), retailTransaction); + new DefaultTreeNode(new PrivilegeHolder(Privileges.PharmacyReturnItemsOnly, "Pharmacy Return Items Only"), retailTransaction); + new DefaultTreeNode(new PrivilegeHolder(Privileges.PharmacyReturnItemsAndPayments, "Pharmacy Return Items And Payments"), retailTransaction); + new DefaultTreeNode(new PrivilegeHolder(Privileges.PharmacySearchReturnBill, "Pharmacy Search Return Bill"), retailTransaction); + new DefaultTreeNode(new PrivilegeHolder(Privileges.PharmacySaleCancel, "Pharmacy Sale Bill Cancel"), retailTransaction); + new DefaultTreeNode(new PrivilegeHolder(Privileges.PharmacyAddToStock, "Pharmacy Add To Stock"), retailTransaction); + + // Pharmacy Wholesale Transaction Privileges + TreeNode pharmacyWholeSaleTransAction = new DefaultTreeNode(new PrivilegeHolder(null, "Pharmacy Wholesale Transaction"), pharmacyNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.PharmacyWholeSaleTransactionMenue, "Procurement Menu"), pharmacyWholeSaleTransAction); + new DefaultTreeNode(new PrivilegeHolder(Privileges.PharmacyWholesaleSale, "Pharmacy Wholesale Sale"), pharmacyWholeSaleTransAction); + new DefaultTreeNode(new PrivilegeHolder(Privileges.PharmacyWholesaleSaleForCashier, "Pharmacy Wholesale Sale For Cashier"), pharmacyWholeSaleTransAction); + new DefaultTreeNode(new PrivilegeHolder(Privileges.PharmacyWholesaleSearchSaleBill, "Pharmacy Wholesale Search Sale Bill"), pharmacyWholeSaleTransAction); + new DefaultTreeNode(new PrivilegeHolder(Privileges.PharmacyWholesaleSearchSaleBillToPay, "Pharmacy Wholesale Search Sale Bill To Pay"), pharmacyWholeSaleTransAction); + new DefaultTreeNode(new PrivilegeHolder(Privileges.PharmacyWholesaleSearchSaleBillItems, "Pharmacy Wholesale Search Sale Bill Items"), pharmacyWholeSaleTransAction); + new DefaultTreeNode(new PrivilegeHolder(Privileges.PharmacyWholesaleReturnItemsOnly, "Pharmacy Wholesale Return Items Only"), pharmacyWholeSaleTransAction); + new DefaultTreeNode(new PrivilegeHolder(Privileges.PharmacyWholesaleWholeSaleAddToStock, "Pharmacy Wholesale Add To Stock"), pharmacyWholeSaleTransAction); + new DefaultTreeNode(new PrivilegeHolder(Privileges.PharmacyWholeSalePurchase, "Pharmacy Whole Sale Purchase"), pharmacyWholeSaleTransAction); + new DefaultTreeNode(new PrivilegeHolder(Privileges.PharmacySearchReturnBillItems, "Pharmacy Search Return Bill Items"), pharmacyWholeSaleTransAction); + + // Pharmacy Disbursement Privileges + TreeNode disbursementNode = new DefaultTreeNode(new PrivilegeHolder(null, "Pharmacy Disbursement"), pharmacyNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.PharmacyDisburesementMenu, "Pharmacy Disbursement Menu"), disbursementNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.PharmacyDisbursementRequest, "Request"), disbursementNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.PharmacyDisbursementIssurForRequest, "Issue for Request"), disbursementNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.PharmacyDisbursementDirectIssue, "Direct Issue"), disbursementNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.PharmacyDisbursementRecieve, "Receive"), disbursementNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.TransferReciveApproval, "Receive Approval"), disbursementNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.PharmacyDisbursementReports, "Pharmacy Disbursement Reports"), disbursementNode); + + // Inpatient Medication Management Privileges + TreeNode inpatientMedicationManagementNode = new DefaultTreeNode(new PrivilegeHolder(null, "Inpatient Medication Management"), pharmacyNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.InpatientMedicationManagementMenue, "Procurement Menu"), inpatientMedicationManagementNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.PharmacyDirectIssueToBht, "Pharmacy Direct Issue To Bht"), inpatientMedicationManagementNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.PharmacyDirectIssueToTheaterCases, "Pharmacy Direct Issue To Theater Cases"), inpatientMedicationManagementNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.PharmacyBhtIssueRequest, "Pharmacy Bht Issue Request"), inpatientMedicationManagementNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.PharmacySearchInpatientDirectIssuesbyBill, "Pharmacy Search Inpatient Direct Issues by Bill"), inpatientMedicationManagementNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.PharmacySearchInpatientDirectIssuesbyItem, "Pharmacy Search Inpatient Direct Issues by Item"), inpatientMedicationManagementNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.PharmacySearchInpatientDirectIssueReturnsbyBill, "Pharmacy Search Inpatient Direct Issue Returns by Bill"), inpatientMedicationManagementNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.PharmacysSearchInpatientDirectIssueReturnsbyItem, "Pharmacy Search Inpatient Direct Issue Returns by Item"), inpatientMedicationManagementNode); + + // Pharmacy Procurement Privileges + TreeNode procurementNode = new DefaultTreeNode(new PrivilegeHolder(null, "Pharmacy Procurement"), pharmacyNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.PharmacyProcurementMenu, "Procurement Menu"), procurementNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.CreatePurchaseOrder, "Create Purchase Order"), procurementNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.AutoOrderPModel, "Auto Order (P Model)"), procurementNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.AutoOrderQModal, "Auto Order (Q Model)"), procurementNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.DirectPurchase, "Direct Purchase"), procurementNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.PurchaseOrdersApprovel, "Purchase Orders Approval"), procurementNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.GoodsRecipt, "Pharmacy Good Receipt"), procurementNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.ReturnReceviedGoods, "Pharmacy Return Received Goods"), procurementNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.ReturnWithoutRecipt, "Pharmacy Return Without Receipt"), procurementNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.PharmacyOrderCancellation, "Pharmacy Order Cancellation"), procurementNode); + + // Pharmacy Dealer Payment Privileges + TreeNode dealerPaymentNode = new DefaultTreeNode(new PrivilegeHolder(null, "Pharmacy Dealer Payment"), pharmacyNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.PharmacyDealerPaymentMenue, "Pharmacy Dealer Payment Menu"), dealerPaymentNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.PharmacyDealerDueSearch, "Pharmacy Dealer Due Search"), dealerPaymentNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.PharmacyDealerDueByAge, "Pharmacy Dealer Due By Age"), dealerPaymentNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.PharmacyPayment, "Pharmacy Payment"), dealerPaymentNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.PharmacyGRNPaymentApprove, "Pharmacy GRN Payment Approve"), dealerPaymentNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.PharmacyGRNPaymentDoneSearch, "Pharmacy GRN Payment Done Search"), dealerPaymentNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.PharmacyCreditDueAndAccess, "Pharmacy Credit Due And Access"), dealerPaymentNode); + + // Pharmacy Adjustment Privileges + TreeNode pharmacyAdjustmentNode = new DefaultTreeNode(new PrivilegeHolder(null, "Pharmacy Adjustment"), pharmacyNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.PharmacyAdjustmentMenue, "Pharmacy Adjustment Menu"), pharmacyAdjustmentNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.PharmacyAdjustmentDepartmentStockQTY, "Pharmacy Adjustment Department Stock QTY"), pharmacyAdjustmentNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.PharmacyAdjustmentDepartmentStockBySingleItemQTY, "Pharmacy Adjustment Department Stock By Single Item QTY"), pharmacyAdjustmentNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.PharmacyAdjustmentStaffStockAdjustment, "Pharmacy Adjustment Staff Stock Adjustment"), pharmacyAdjustmentNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.PharmacyAdjustmentPurchaseRate, "Pharmacy Adjustment Purchase Rate"), pharmacyAdjustmentNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.PharmacyAdjustmentSaleRate, "Pharmacy Adjustment Sale Rate"), pharmacyAdjustmentNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.PharmacyAdjustmentWholeSaleRate, "Pharmacy Adjustment Wholesale Rate"), pharmacyAdjustmentNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.PharmacyAdjustmentExpiryDate, "Pharmacy Adjustment Expiry Date"), pharmacyAdjustmentNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.PharmacyAdjustmentSearchAdjustmentBills, "Pharmacy Adjustment Search Adjustment Bills"), pharmacyAdjustmentNode); + + // Pharmacy Disposal Privileges + TreeNode pharmacyDisposalNode = new DefaultTreeNode(new PrivilegeHolder(null, "Pharmacy Disposal"), pharmacyNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.PharmacyDisposalMenue, "Pharmacy Disposal Menu"), pharmacyDisposalNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.PharmacyDisposalIssue, "Pharmacy Disposal Issue"), pharmacyDisposalNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.PharmacyDisposalSearchIssueBill, "Pharmacy Disposal Search Issue Bill"), pharmacyDisposalNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.PharmacyDisposalSearchIssueBillItems, "Pharmacy Disposal Search Issue Bill Items"), pharmacyDisposalNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.PharmacyDisposalSearchIssueReturnBill, "Pharmacy Disposal Search Issue Return Bill"), pharmacyDisposalNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.PharmacyDisposalUnitIssueMargin, "Pharmacy Disposal Unit Issue Margin"), pharmacyDisposalNode); + + // Optician Privileges TreeNode opticianNode = new DefaultTreeNode(new PrivilegeHolder(null, "Optician"), allNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.OpticianPatientManagement, "Patient Management"), opticianNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.OpticianAppointmentManagement, "Appointment Management"), opticianNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.OpticianEmr, "EMR"), opticianNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.OpticianStockManagement, "Stock Management"), opticianNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.OpticianProductCatalog, "Product Catalog"), opticianNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.OpticianRepairManagement, "Repair Management"), opticianNode); - TreeNode opticianPatientManagementNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.OpticianPatientManagement, "Patient Management"), opticianNode); - TreeNode opticianAppointmentManagementNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.OpticianAppointmentManagement, "Appointment Management"), opticianNode); - TreeNode opticianEmrNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.OpticianEmr, "EMR"), opticianNode); - TreeNode opticianStockManagementNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.OpticianStockManagement, "Stock Management"), opticianNode); - TreeNode opticianProductCatalogNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.OpticianProductCatalog, "Product Catalog"), opticianNode); - TreeNode opticianRepairManagementNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.OpticianRepairManagement, "Repair Management"), opticianNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.PharmacyItemSearch, "Item Search"), pharmacyNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.PharmacyGenarateReports, "Generate Reports"), pharmacyNode); + new DefaultTreeNode(new PrivilegeHolder(Privileges.PharmacySummaryViews, "Summary Views"), pharmacyNode); - TreeNode PharmacyItemSearch = new DefaultTreeNode(new PrivilegeHolder(Privileges.PharmacyItemSearch, "Item Search"), pharmacyNode); - TreeNode PharmacyGenarateReports = new DefaultTreeNode(new PrivilegeHolder(Privileges.PharmacyGenarateReports, "Genarate Reports"), pharmacyNode); - TreeNode PharmacySummaryViews = new DefaultTreeNode(new PrivilegeHolder(Privileges.PharmacySummaryViews, "Summary Views"), pharmacyNode); return root; } @@ -689,49 +712,92 @@ public void saveWebUserPrivileges(WebUser u, List selected, Dep public void saveWebUserPrivileges() { List selectedPrivileges = extractPrivileges(selectedNodes); - for (WebUserPrivilege wup : getCurrentWebUserPrivileges()) { + // Retire all current web user privileges initially + List currentPrivileges = getCurrentWebUserPrivileges(); + System.out.println("Retiring all current web user privileges:"); + for (WebUserPrivilege wup : currentPrivileges) { wup.setRetired(true); - + System.out.println("Retiring privilege: " + wup.getPrivilege()); } - getFacade().batchEdit(getCurrentWebUserPrivileges()); + if (selectedPrivileges == null) { + System.out.println("No selected privileges to process."); + getFacade().batchEdit(currentPrivileges); return; } List newWups = new ArrayList<>(); - List oldWups = new ArrayList<>(); + List nonRetiredPrivileges = new ArrayList<>(); for (PrivilegeHolder ph : selectedPrivileges) { if (ph.getPrivilege() == null) { continue; } - String jpql = "select w" - + " from WebUserPrivilege w " - + " where w.department=:dep " - + " and w.webUser=:wu " - + " and w.privilege=:p"; - Map m = new HashMap(); - m.put("dep", department); - m.put("wu", currentWebUser); - m.put("p", ph.getPrivilege()); - WebUserPrivilege wup = getFacade().findFirstByJpql(jpql, m); - if (wup == null) { - wup = new WebUserPrivilege(); - wup.setDepartment(department); - wup.setWebUser(currentWebUser); - wup.setPrivilege(ph.getPrivilege()); - newWups.add(wup); - } else { - wup.setRetired(false); - oldWups.add(wup); + + boolean found = false; + for (WebUserPrivilege wup : currentPrivileges) { + if (wup.getPrivilege() == ph.getPrivilege()) { + wup.setRetired(false); + nonRetiredPrivileges.add(wup); + found = true; + System.out.println("Unretiring privilege: " + wup.getPrivilege()); + break; + } + } + + if (!found) { + WebUserPrivilege newWup = new WebUserPrivilege(); + newWup.setDepartment(department); + newWup.setWebUser(currentWebUser); + newWup.setPrivilege(ph.getPrivilege()); + newWups.add(newWup); + System.out.println("Adding new privilege: " + newWup.getPrivilege()); } } + getFacade().batchCreate(newWups); - getFacade().batchEdit(oldWups); + getFacade().batchEdit(currentPrivileges); + + // Combine non-retired current privileges and newly added privileges + List updatedPrivileges = new ArrayList<>(nonRetiredPrivileges); + updatedPrivileges.addAll(newWups); + + // Set the combined list as current web user privileges + setCurrentWebUserPrivileges(updatedPrivileges); + + // Log final state after saving + System.out.println("Final web user privileges:"); + for (WebUserPrivilege wup : updatedPrivileges) { + System.out.println("Final privilege: " + wup.getPrivilege() + ", retired: " + wup.isRetired()); + } + fillUserPrivileges(); JsfUtil.addSuccessMessage("Updated"); } + private List extractPrivileges(TreeNode[] selectedNodes) { + List privileges = new ArrayList<>(); + if (selectedNodes != null) { + for (TreeNode node : selectedNodes) { + PrivilegeHolder ph = (PrivilegeHolder) node.getData(); + privileges.add(ph); + } + } + return privileges; + } + +// public static List extractPrivileges(TreeNode[] selectedNodes) { +// List privileges = new ArrayList<>(); +// if (selectedNodes != null) { +// for (TreeNode node : selectedNodes) { +// Object data = node.getData(); +// if (data instanceof PrivilegeHolder) { +// privileges.add((PrivilegeHolder) data); +// } +// } +// } +// return privileges; +// } public void saveWebUserRolePrivileges() { List selectedPrivileges = extractPrivileges(selectedNodes); @@ -775,19 +841,6 @@ public void saveWebUserRolePrivileges() { JsfUtil.addSuccessMessage("Updated"); } - public static List extractPrivileges(TreeNode[] selectedNodes) { - List privileges = new ArrayList<>(); - if (selectedNodes != null) { - for (TreeNode node : selectedNodes) { - Object data = node.getData(); - if (data instanceof PrivilegeHolder) { - privileges.add((PrivilegeHolder) data); - } - } - } - return privileges; - } - private static void checkNodes(TreeNode root, List privilegesToCheck) { if (root == null || privilegesToCheck == null || privilegesToCheck.isEmpty()) { return; @@ -843,8 +896,8 @@ public void fillUserPrivileges() { } String j = "SELECT i " + " FROM WebUserPrivilege i " - + " where i.webUser<>:wu " - + " and i.retired=:ret " + + " where i.webUser=:wu " + + " and i.retired<>:ret " + " and i.department=:dep"; Map m = new HashMap(); m.put("wu", currentWebUser); @@ -854,8 +907,13 @@ public void fillUserPrivileges() { currentUserPrivilegeHolders = createPrivilegeHolders(currentWebUserPrivileges); unselectTreeNodes(rootTreeNode); checkNodes(rootTreeNode, currentUserPrivilegeHolders); + privilegesLoaded=true; } + public void makePrivilegesNeededToBeReloaded(){ + privilegesLoaded=false; + } + public void fillUserRolePrivileges(WebUserRole u) { webUserRole = u; fillUserRolePrivileges(); @@ -1005,6 +1063,16 @@ public void setRoleFacede(WebUserRolePrivilegeFacade facede) { this.facede = facede; } + public boolean isPrivilegesLoaded() { + return privilegesLoaded; + } + + public void setPrivilegesLoaded(boolean privilegesLoaded) { + this.privilegesLoaded = privilegesLoaded; + } + + + // // /** diff --git a/src/main/java/com/divudi/bean/common/UserRoleIconController.java b/src/main/java/com/divudi/bean/common/UserRoleIconController.java index 8c51ec6b93..5cd58edfdf 100644 --- a/src/main/java/com/divudi/bean/common/UserRoleIconController.java +++ b/src/main/java/com/divudi/bean/common/UserRoleIconController.java @@ -11,8 +11,6 @@ import com.divudi.data.Icon; import com.divudi.entity.Department; import com.divudi.entity.UserIcon; -import com.divudi.entity.WebUser; -import com.divudi.facade.DepartmentFacade; import com.divudi.facade.UserIconFacade; import com.divudi.bean.common.util.JsfUtil; import com.divudi.entity.WebUserRole; @@ -22,10 +20,8 @@ import java.util.Collections; import java.util.Comparator; import java.util.HashMap; -import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Set; import javax.ejb.EJB; import javax.enterprise.context.SessionScoped; import javax.faces.component.UIComponent; diff --git a/src/main/java/com/divudi/bean/common/WebUserController.java b/src/main/java/com/divudi/bean/common/WebUserController.java index c3b0dd9889..108dc1a3f5 100644 --- a/src/main/java/com/divudi/bean/common/WebUserController.java +++ b/src/main/java/com/divudi/bean/common/WebUserController.java @@ -48,7 +48,6 @@ import javax.faces.convert.FacesConverter; import javax.inject.Inject; import javax.inject.Named; -import javax.persistence.TemporalType; import org.primefaces.event.FlowEvent; /** @@ -828,6 +827,7 @@ public String navigateToManagePrivileges() { getUserPrivilageController().setCurrentWebUser(selected); getUserPrivilageController().init(); getUserPrivilageController().setDepartments(getUserPrivilageController().fillWebUserDepartments(selected)); + getUserPrivilageController().setPrivilegesLoaded(false); return "/admin/users/user_privileges?faces-redirect=true"; } @@ -886,7 +886,7 @@ public String navigateToManageRoutes() { } getUserDepartmentController().setSelectedUser(selected); getUserDepartmentController().setItems(getUserDepartmentController().fillWebUserDepartments(selected)); - return "/admin/users/user_department?faces-redirect=true"; + return "/admin/users/user_routes?faces-redirect=true"; } public String toManageDashboards() { diff --git a/src/main/java/com/divudi/bean/common/WebUserRoleController.java b/src/main/java/com/divudi/bean/common/WebUserRoleController.java index 02fa64d2e3..d978535ca8 100644 --- a/src/main/java/com/divudi/bean/common/WebUserRoleController.java +++ b/src/main/java/com/divudi/bean/common/WebUserRoleController.java @@ -11,7 +11,6 @@ import com.divudi.bean.common.util.JsfUtil; import com.divudi.entity.WebUserRole; import com.divudi.facade.WebUserRoleFacade; -import com.google.common.collect.HashBiMap; import java.io.Serializable; import java.util.Date; import java.util.HashMap; diff --git a/src/main/java/com/divudi/bean/common/util/HL7Utils.java b/src/main/java/com/divudi/bean/common/util/HL7Utils.java index d674418cd2..0a2575d318 100644 --- a/src/main/java/com/divudi/bean/common/util/HL7Utils.java +++ b/src/main/java/com/divudi/bean/common/util/HL7Utils.java @@ -1,28 +1,14 @@ package com.divudi.bean.common.util; import ca.uhn.hl7v2.DefaultHapiContext; -import ca.uhn.hl7v2.HL7Exception; import ca.uhn.hl7v2.HapiContext; -import ca.uhn.hl7v2.model.Message; -import ca.uhn.hl7v2.parser.Parser; import java.io.IOException; import java.util.logging.Level; import java.util.logging.Logger; import ca.uhn.hl7v2.HL7Exception; import ca.uhn.hl7v2.model.Message; -import ca.uhn.hl7v2.model.v25.datatype.CX; -import ca.uhn.hl7v2.model.v25.datatype.XPN; -import ca.uhn.hl7v2.model.v25.group.OUL_R22_ORDER; -import ca.uhn.hl7v2.model.v25.group.OUL_R22_RESULT; -import ca.uhn.hl7v2.model.v25.group.OUL_R22_SPECIMEN; -import ca.uhn.hl7v2.model.v25.message.OUL_R22; -import ca.uhn.hl7v2.model.v25.segment.*; import ca.uhn.hl7v2.parser.Parser; -import ca.uhn.hl7v2.parser.PipeParser; - -import java.util.ArrayList; -import java.util.List; /** * diff --git a/src/main/java/com/divudi/bean/common/util/JsfUtil.java b/src/main/java/com/divudi/bean/common/util/JsfUtil.java index 64e05daaf6..c5a2df9e30 100644 --- a/src/main/java/com/divudi/bean/common/util/JsfUtil.java +++ b/src/main/java/com/divudi/bean/common/util/JsfUtil.java @@ -1,9 +1,6 @@ package com.divudi.bean.common.util; import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.HashSet; import java.util.List; import java.util.Set; import javax.faces.application.FacesMessage; diff --git a/src/main/java/com/divudi/bean/emr/DataUploadController.java b/src/main/java/com/divudi/bean/emr/DataUploadController.java index 4cf63fed84..bcf0bd0241 100644 --- a/src/main/java/com/divudi/bean/emr/DataUploadController.java +++ b/src/main/java/com/divudi/bean/emr/DataUploadController.java @@ -20,7 +20,6 @@ import com.divudi.bean.common.DoctorController; import com.divudi.bean.common.DoctorSpecialityController; import com.divudi.bean.common.EnumController; -import com.divudi.bean.common.FeeController; import com.divudi.bean.common.InstitutionController; import com.divudi.bean.common.ItemController; import com.divudi.bean.common.ItemFeeController; @@ -54,7 +53,6 @@ import com.divudi.entity.Consultant; import com.divudi.entity.Department; import com.divudi.entity.DoctorSpeciality; -import com.divudi.entity.Fee; import com.divudi.entity.Institution; import com.divudi.entity.Item; import com.divudi.entity.ItemFee; @@ -85,9 +83,7 @@ import com.divudi.data.SymanticType; import com.divudi.entity.Doctor; import com.divudi.entity.inward.InwardService; -import com.divudi.facade.FeeFacade; import com.divudi.java.CommonFunctions; -import com.mysql.cj.jdbc.interceptors.SessionAssociationInterceptor; import org.apache.poi.xssf.usermodel.XSSFWorkbook; import javax.inject.Named; @@ -95,6 +91,8 @@ import java.io.InputStream; import java.io.Serializable; import java.text.DecimalFormat; +import java.text.ParseException; +import java.text.SimpleDateFormat; import java.time.Instant; import java.time.LocalDate; import java.time.ZoneId; @@ -824,20 +822,12 @@ private List readDoctorsFromExcel(InputStream inputStream) throws IOExce return docs; } - private List readStaffFromExcel(InputStream inputStream) throws IOException { + public List readStaffFromExcel(InputStream inputStream) throws IOException { List stf = new ArrayList<>(); Workbook workbook = new XSSFWorkbook(inputStream); Sheet sheet = workbook.getSheetAt(0); Iterator rowIterator = sheet.rowIterator(); - itemsToSave = new ArrayList<>(); - masterItemsToSave = new ArrayList<>(); - itemFeesToSave = new ArrayList<>(); - categoriesSaved = new ArrayList<>(); - institutionsSaved = new ArrayList<>(); - departmentsSaved = new ArrayList<>(); - itemsSkipped = new ArrayList<>(); - // Assuming the first row contains headers, skip it if (rowIterator.hasNext()) { rowIterator.next(); @@ -846,22 +836,34 @@ private List readStaffFromExcel(InputStream inputStream) throws IOExcepti while (rowIterator.hasNext()) { Row row = rowIterator.next(); -// DoctorSpeciality speciality; -// Doctor doctor; Staff staff; Title title; String epfNo = null; String titleString = null; String name = null; + String fullName = null; String nameWithInitials = null; + String address = null; + String sex = null; + String nicNo = null; + Date dob = null; + Date retired = null; + String departmentName = null; + String branchName = null; + String acNo = null; + String bankName = null; + + Department department=null; + Institution institution=null; + Institution bank=null; + Sex gender=null; Cell epfNoCell = row.getCell(0); if (epfNoCell != null) { if (epfNoCell.getCellType() == CellType.NUMERIC) { epfNo = String.valueOf((int) epfNoCell.getNumericCellValue()); - } - if (epfNoCell.getCellType() == CellType.STRING) { + } else if (epfNoCell.getCellType() == CellType.STRING) { epfNo = epfNoCell.getStringCellValue(); } } @@ -874,19 +876,100 @@ private List readStaffFromExcel(InputStream inputStream) throws IOExcepti Cell nameCell = row.getCell(2); if (nameCell != null && nameCell.getCellType() == CellType.STRING) { name = nameCell.getStringCellValue(); + } + Cell fullNameCell = row.getCell(3); + if (fullNameCell != null && fullNameCell.getCellType() == CellType.STRING) { + fullName = fullNameCell.getStringCellValue(); } - Cell nameWithInitialsCell = row.getCell(3); + Cell nameWithInitialsCell = row.getCell(4); if (nameWithInitialsCell != null && nameWithInitialsCell.getCellType() == CellType.STRING) { nameWithInitials = nameWithInitialsCell.getStringCellValue(); } - if (name == null || name.trim().equals("")) { - continue; + Cell addressCell = row.getCell(5); + if (addressCell != null && addressCell.getCellType() == CellType.STRING) { + address = addressCell.getStringCellValue(); + } + + Cell sexCell = row.getCell(6); + if (sexCell != null && sexCell.getCellType() == CellType.STRING) { + sex = sexCell.getStringCellValue(); + gender=Sex.valueOf(sex); + } + + Cell nicNoCell = row.getCell(7); + if (nicNoCell != null && nicNoCell.getCellType() == CellType.STRING) { + nicNo = nicNoCell.getStringCellValue(); + } + + Cell dobCell = row.getCell(8); + +if (dobCell != null) { + if (dobCell.getCellType() == CellType.NUMERIC && DateUtil.isCellDateFormatted(dobCell)) { + dob = dobCell.getDateCellValue(); + } else if (dobCell.getCellType() == CellType.STRING) { + String dobString = dobCell.getStringCellValue(); + SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); // Adjust the date format as needed + try { + dob = dateFormat.parse(dobString); + } catch (ParseException e) { + dob = null; + } + } +} + + Cell retiredCell = row.getCell(9); +if (retiredCell != null) { + if (retiredCell.getCellType() == CellType.NUMERIC && DateUtil.isCellDateFormatted(retiredCell)) { + retired = retiredCell.getDateCellValue(); + } else if (retiredCell.getCellType() == CellType.STRING) { + String retiredString = retiredCell.getStringCellValue(); + SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); + try { + retired = dateFormat.parse(retiredString); + } catch (ParseException e) { + retired = null; + } + } +} + + Cell departmentCell = row.getCell(10); + if (departmentCell != null && departmentCell.getCellType() == CellType.STRING) { + departmentName = departmentCell.getStringCellValue(); + } + if (departmentName != null) { + department = departmentController.findAndSaveDepartmentByName(name); + } + + Cell branchCell = row.getCell(11); + if (branchCell != null && branchCell.getCellType() == CellType.STRING) { + branchName = branchCell.getStringCellValue(); + } + if (branchName != null) { + institution = institutionController.findAndSaveInstitutionByName(branchName); + } + + Cell acNoCell = row.getCell(12); + if (acNoCell != null && acNoCell.getCellType() == CellType.STRING) { + acNo = acNoCell.getStringCellValue(); + } + + Cell bankCell = row.getCell(13); + if (bankCell != null && bankCell.getCellType() == CellType.STRING) { + bankName = bankCell.getStringCellValue(); + } + if (bank != null) { + bank=institutionController.findAndSaveInstitutionByName(bankName); + bank.setInstitutionType(InstitutionType.Bank); + institutionController.save(bank); } - if (nameWithInitials == null || nameWithInitials.trim().equals("")) { + if (name == null || name.trim().isEmpty()) { + continue; + } + if (nameWithInitials == null || nameWithInitials.trim().isEmpty()) { continue; } @@ -900,9 +983,19 @@ private List readStaffFromExcel(InputStream inputStream) throws IOExcepti staff.getPerson().setName(name); staff.getPerson().setTitle(title); staff.getPerson().setNameWithInitials(nameWithInitials); + staff.getPerson().setFullName(fullName); + staff.getPerson().setAddress(address); + staff.getPerson().setSex(gender); + staff.getPerson().setNic(nicNo); + staff.getPerson().setDob(dob); + staff.setDateRetired(retired); + staff.setDepartment(department); + staff.setInstitution(institution); + staff.setAccountNo(acNo); + staff.setBankBranch(bank); stf.add(staff); - } + return stf; } @@ -3108,6 +3201,121 @@ private List readSuppliersFromExcel(InputStream inputStream) throws return suppliersList; } + + private List readCollectingCentrePriceListFromXcel(InputStream inputStream) throws IOException { + Workbook workbook = new XSSFWorkbook(inputStream); + Sheet sheet = workbook.getSheetAt(0); + Iterator rowIterator = sheet.rowIterator(); + + itemFees = new ArrayList<>(); + + // Assuming the first row contains headers, skip it + if (rowIterator.hasNext()) { + rowIterator.next(); + } + Institution runningIns = null; + Department runningDept = null; + while (rowIterator.hasNext()) { + Row row = rowIterator.next(); + Institution institution; + Department department; + Item item=null; + String departmentName=null; + Category category = null; + String institutionName = null; + String itemCode =null; + String itemName=null; + String feeListType=null; + Double price=0.0; + + Cell insCell = row.getCell(4); + if (insCell != null && insCell.getCellType() == CellType.STRING) { + institutionName = insCell.getStringCellValue(); + } + if (institutionName == null || institutionName.trim().equals("")) { + institutionName = "Other"; + } + if (runningIns == null) { + institution = institutionController.findAndSaveInstitutionByName(institutionName); + runningIns = institution; + } else if (runningIns.getName().equals(institutionName)) { + institution = runningIns; + } else { + institution = institutionController.findAndSaveInstitutionByName(institutionName); + runningIns = institution; + } + + Cell deptCell = row.getCell(5); + if (deptCell != null && deptCell.getCellType() == CellType.STRING) { + departmentName = deptCell.getStringCellValue(); + } + if (departmentName == null || departmentName.trim().equals("")) { + departmentName = institutionName; + } + if (runningDept == null) { + department = departmentController.findAndSaveDepartmentByName(departmentName); + runningDept = department; + } else if (runningDept.getName().equals(departmentName)) { + department = runningDept; + } else { + department = departmentController.getDefaultDepatrment(institution); + runningDept = department; + } + + // Column A: Department Code (Required) + Cell itemCodeCell = row.getCell(0); + if (itemCodeCell != null && itemCodeCell.getCellType() == CellType.STRING) { + itemCode = itemCodeCell.getStringCellValue(); + } + if (itemCode != null) { + item=itemController.findItemByCode(itemCode); + } + if (itemCode == null || itemCode.trim().isEmpty()) { + continue; + } + + // Column B: Department Name (Required) + Cell itemNameCell = row.getCell(1); + if (itemNameCell != null && itemNameCell.getCellType() == CellType.STRING) { + itemName = itemNameCell.getStringCellValue(); + } + if (itemName == null || itemName.trim().isEmpty()) { + continue; + } + + // Column C: Bill Prefix (Optional) + Cell priceCell = row.getCell(3); + if (priceCell != null && priceCell.getCellType() == CellType.NUMERIC) { + price = priceCell.getNumericCellValue(); + } + + Cell itemFeeListCell = row.getCell(2); + if (itemFeeListCell != null && itemFeeListCell.getCellType() == CellType.STRING) { + feeListType = itemFeeListCell.getStringCellValue(); + } + if (feeListType != null) { + System.out.println("itemFeeListCell = " + feeListType); + category=categoryController.findAndCreateCategoryByName(feeListType); + category.setSymanticType(SymanticHyrachi.Fee_List_Type); + categoryFacade.edit(category); + } + + ItemFee fee=new ItemFee(); + fee.setCreatedAt(new Date()); + fee.setCreater(sessionController.getLoggedUser()); + fee.setForInstitution(null); + fee.setForCategory(category); + fee.setItem(item); + fee.setFee(price); + fee.setInstitution(institution); + fee.setDepartment(department); + itemFeeFacade.create(fee); + + } + + return itemFees; + + } private List readCollectingCentrePriceListFromXcel(InputStream inputStream) throws IOException { @@ -3202,7 +3410,8 @@ private List readCollectingCentrePriceListFromXcel(InputStream inputStr feeListType = itemFeeListCell.getStringCellValue(); } if (feeListType != null) { - category=categoryController.findAndCreateCategoryByName(itemName); + System.out.println("itemFeeListCell = " + feeListType); + category=categoryController.findAndCreateCategoryByName(feeListType); category.setSymanticType(SymanticHyrachi.Fee_List_Type); categoryFacade.edit(category); } diff --git a/src/main/java/com/divudi/bean/emr/EmrController.java b/src/main/java/com/divudi/bean/emr/EmrController.java index ed78efc469..ac8276fd9e 100644 --- a/src/main/java/com/divudi/bean/emr/EmrController.java +++ b/src/main/java/com/divudi/bean/emr/EmrController.java @@ -4,10 +4,7 @@ import javax.inject.Named; import javax.enterprise.context.SessionScoped; import java.io.Serializable; -import javax.faces.context.FacesContext; import javax.inject.Inject; -import org.primefaces.PrimeFaces; -import org.primefaces.component.accordionpanel.AccordionPanel; import org.primefaces.component.tabview.TabView; import org.primefaces.event.TabChangeEvent; diff --git a/src/main/java/com/divudi/bean/hr/AttendanceUploadController.java b/src/main/java/com/divudi/bean/hr/AttendanceUploadController.java index 7e09553bc9..98b5005459 100644 --- a/src/main/java/com/divudi/bean/hr/AttendanceUploadController.java +++ b/src/main/java/com/divudi/bean/hr/AttendanceUploadController.java @@ -5,7 +5,6 @@ package com.divudi.bean.hr; import com.divudi.bean.common.SessionController; -import com.divudi.data.hr.FingerPrintRecordType; import com.divudi.data.hr.Times; import com.divudi.ejb.HumanResourceBean; import com.divudi.entity.Staff; diff --git a/src/main/java/com/divudi/bean/hr/HrReportController.java b/src/main/java/com/divudi/bean/hr/HrReportController.java index 140bb2449e..67952fa86a 100644 --- a/src/main/java/com/divudi/bean/hr/HrReportController.java +++ b/src/main/java/com/divudi/bean/hr/HrReportController.java @@ -9,7 +9,6 @@ import com.divudi.bean.common.SessionController; import com.divudi.data.MonthEndRecord; -import com.divudi.data.Sex; import com.divudi.data.dataStructure.WeekDayWork; import com.divudi.data.hr.DayType; import com.divudi.data.hr.DepartmentAttendance; @@ -53,10 +52,6 @@ import com.divudi.facade.StaffShiftHistoryFacade; import com.divudi.bean.common.util.JsfUtil; import com.divudi.java.CommonFunctions; -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.InputStream; import java.io.Serializable; import java.text.DateFormat; import java.text.SimpleDateFormat; diff --git a/src/main/java/com/divudi/bean/hr/StaffController.java b/src/main/java/com/divudi/bean/hr/StaffController.java index d5b012e32f..1e54ea98fb 100644 --- a/src/main/java/com/divudi/bean/hr/StaffController.java +++ b/src/main/java/com/divudi/bean/hr/StaffController.java @@ -44,7 +44,6 @@ import com.divudi.facade.StaffFacade; import com.divudi.facade.StaffSalaryFacade; import com.divudi.bean.common.util.JsfUtil; -import com.divudi.data.Title; import java.io.ByteArrayInputStream; import java.io.InputStream; import java.io.Serializable; diff --git a/src/main/java/com/divudi/bean/hr/WorkingTimeController.java b/src/main/java/com/divudi/bean/hr/WorkingTimeController.java index c5e60ab8c6..479f63bbc3 100644 --- a/src/main/java/com/divudi/bean/hr/WorkingTimeController.java +++ b/src/main/java/com/divudi/bean/hr/WorkingTimeController.java @@ -10,7 +10,6 @@ import com.divudi.bean.common.BillController; import com.divudi.bean.common.ConfigOptionApplicationController; -import com.divudi.bean.common.ConfigOptionController; import com.divudi.bean.common.FeeController; import com.divudi.bean.common.ItemController; import com.divudi.bean.common.OpdPreBillController; @@ -35,7 +34,6 @@ import com.divudi.entity.BillItem; import com.divudi.entity.BilledBill; import com.divudi.entity.Doctor; -import com.divudi.entity.PatientEncounter; import com.divudi.entity.Payment; import com.divudi.entity.Speciality; import com.divudi.entity.Staff; diff --git a/src/main/java/com/divudi/bean/inward/AdmissionController.java b/src/main/java/com/divudi/bean/inward/AdmissionController.java index 8747364f7d..5b2a629067 100644 --- a/src/main/java/com/divudi/bean/inward/AdmissionController.java +++ b/src/main/java/com/divudi/bean/inward/AdmissionController.java @@ -40,7 +40,6 @@ import com.divudi.facade.PersonFacade; import com.divudi.facade.RoomFacade; import com.divudi.bean.common.util.JsfUtil; -import com.divudi.bean.opd.OpdBillController; import com.divudi.bean.pharmacy.PharmacyRequestForBhtController; import com.divudi.data.clinical.ClinicalFindingValueType; import com.divudi.entity.Staff; diff --git a/src/main/java/com/divudi/bean/inward/BhtEditController.java b/src/main/java/com/divudi/bean/inward/BhtEditController.java index 90c47b2f44..105886564e 100644 --- a/src/main/java/com/divudi/bean/inward/BhtEditController.java +++ b/src/main/java/com/divudi/bean/inward/BhtEditController.java @@ -46,7 +46,6 @@ import javax.inject.Inject; import javax.inject.Named; import com.divudi.entity.EncounterCreditCompany; -import com.divudi.entity.Institution; import com.divudi.entity.clinical.ClinicalFindingValue; import com.divudi.facade.ClinicalFindingValueFacade; import com.divudi.facade.EncounterCreditCompanyFacade; diff --git a/src/main/java/com/divudi/bean/inward/BhtSummeryController.java b/src/main/java/com/divudi/bean/inward/BhtSummeryController.java index f04a644930..7f27dbe8d3 100644 --- a/src/main/java/com/divudi/bean/inward/BhtSummeryController.java +++ b/src/main/java/com/divudi/bean/inward/BhtSummeryController.java @@ -56,7 +56,6 @@ import com.divudi.entity.inward.TimedItem; import com.divudi.entity.inward.TimedItemFee; import com.divudi.entity.membership.InwardMemberShipDiscount; -import com.divudi.entity.membership.MembershipScheme; import com.divudi.facade.AdmissionTypeFacade; import com.divudi.facade.BillFacade; import com.divudi.facade.BillFeeFacade; diff --git a/src/main/java/com/divudi/bean/inward/InpatientClinicalDataController.java b/src/main/java/com/divudi/bean/inward/InpatientClinicalDataController.java index 2b8d4a137c..2805be52ec 100644 --- a/src/main/java/com/divudi/bean/inward/InpatientClinicalDataController.java +++ b/src/main/java/com/divudi/bean/inward/InpatientClinicalDataController.java @@ -53,7 +53,6 @@ import com.divudi.facade.PersonFacade; import com.divudi.facade.PrescriptionFacade; import com.divudi.bean.common.util.JsfUtil; -import com.divudi.java.CommonFunctions; import java.io.Serializable; import java.text.SimpleDateFormat; import java.util.ArrayList; @@ -62,44 +61,27 @@ import java.util.Date; import java.util.HashMap; import java.util.List; -import java.util.Map; import javax.ejb.EJB; import javax.enterprise.context.SessionScoped; import javax.inject.Inject; import javax.inject.Named; import javax.persistence.TemporalType; -import org.primefaces.model.DefaultStreamedContent; import javax.faces.context.FacesContext; import javax.faces.event.PhaseId; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; import java.io.IOException; import java.util.logging.Level; import java.util.logging.Logger; -import javax.faces.component.UIComponent; -import javax.faces.convert.Converter; -import javax.faces.convert.FacesConverter; -import org.apache.poi.xwpf.usermodel.XWPFDocument; -import org.apache.poi.xwpf.usermodel.XWPFParagraph; -import org.apache.poi.xwpf.usermodel.XWPFRun; import org.primefaces.event.CaptureEvent; import org.primefaces.event.FileUploadEvent; -import org.primefaces.model.StreamedContent; import org.primefaces.model.file.UploadedFile; import org.apache.poi.xwpf.usermodel.XWPFDocument; import org.apache.poi.xwpf.usermodel.XWPFParagraph; import org.apache.poi.xwpf.usermodel.XWPFRun; -import java.io.*; -import java.nio.file.Files; -import java.nio.file.Path; -import com.itextpdf.text.Document; -import com.itextpdf.text.pdf.PdfWriter; import org.primefaces.model.DefaultStreamedContent; import org.primefaces.model.StreamedContent; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; -import java.nio.charset.StandardCharsets; import java.util.Map; /** diff --git a/src/main/java/com/divudi/bean/inward/InwardSearch.java b/src/main/java/com/divudi/bean/inward/InwardSearch.java index 0b558a5192..7e72999ecf 100644 --- a/src/main/java/com/divudi/bean/inward/InwardSearch.java +++ b/src/main/java/com/divudi/bean/inward/InwardSearch.java @@ -48,8 +48,6 @@ import com.divudi.bean.common.util.JsfUtil; import com.divudi.java.CommonFunctions; import java.io.Serializable; -import java.text.DateFormat; -import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Calendar; import java.util.Date; diff --git a/src/main/java/com/divudi/bean/inward/InwardTimedItemController.java b/src/main/java/com/divudi/bean/inward/InwardTimedItemController.java index ba12e866f0..0f5c7f50f1 100644 --- a/src/main/java/com/divudi/bean/inward/InwardTimedItemController.java +++ b/src/main/java/com/divudi/bean/inward/InwardTimedItemController.java @@ -13,7 +13,6 @@ import com.divudi.data.BillClassType; import com.divudi.data.BillNumberSuffix; -import com.divudi.data.DepartmentType; import com.divudi.data.inward.SurgeryBillType; import com.divudi.ejb.BillNumberGenerator; import com.divudi.bean.common.util.JsfUtil; diff --git a/src/main/java/com/divudi/bean/inward/RoomChangeController.java b/src/main/java/com/divudi/bean/inward/RoomChangeController.java index 2facce3969..21a975d54e 100644 --- a/src/main/java/com/divudi/bean/inward/RoomChangeController.java +++ b/src/main/java/com/divudi/bean/inward/RoomChangeController.java @@ -12,7 +12,6 @@ import com.divudi.data.inward.AdmissionTypeEnum; import com.divudi.entity.Patient; -import com.divudi.entity.Person; import com.divudi.entity.inward.Admission; import com.divudi.entity.inward.GuardianRoom; import com.divudi.entity.inward.PatientRoom; diff --git a/src/main/java/com/divudi/bean/inward/TheatreServiceController.java b/src/main/java/com/divudi/bean/inward/TheatreServiceController.java index 75158f242a..6a1849044a 100644 --- a/src/main/java/com/divudi/bean/inward/TheatreServiceController.java +++ b/src/main/java/com/divudi/bean/inward/TheatreServiceController.java @@ -14,7 +14,6 @@ import com.divudi.bean.common.util.JsfUtil; import com.divudi.data.FeeType; import com.divudi.data.SessionNumberType; -import com.divudi.data.dataStructure.ServiceFee; import com.divudi.data.inward.InwardChargeType; import com.divudi.entity.Department; import com.divudi.entity.Item; diff --git a/src/main/java/com/divudi/bean/lab/CommonReportItemController.java b/src/main/java/com/divudi/bean/lab/CommonReportItemController.java index cfe410a267..555416a8c6 100644 --- a/src/main/java/com/divudi/bean/lab/CommonReportItemController.java +++ b/src/main/java/com/divudi/bean/lab/CommonReportItemController.java @@ -14,7 +14,6 @@ import com.divudi.data.InvestigationItemType; import com.divudi.data.ReportItemType; import com.divudi.entity.Category; -import com.divudi.entity.Upload; import com.divudi.entity.lab.CommonReportItem; import com.divudi.entity.lab.ReportFormat; import com.divudi.entity.lab.ReportItem; diff --git a/src/main/java/com/divudi/bean/lab/InvestigationCategoryController.java b/src/main/java/com/divudi/bean/lab/InvestigationCategoryController.java index 9833b5dde1..7aa222fc6d 100644 --- a/src/main/java/com/divudi/bean/lab/InvestigationCategoryController.java +++ b/src/main/java/com/divudi/bean/lab/InvestigationCategoryController.java @@ -11,7 +11,6 @@ import com.divudi.bean.common.SessionController; -import com.divudi.entity.Category; import com.divudi.entity.lab.InvestigationCategory; import com.divudi.entity.lab.Machine; import com.divudi.facade.InvestigationCategoryFacade; diff --git a/src/main/java/com/divudi/bean/lab/InvestigationController.java b/src/main/java/com/divudi/bean/lab/InvestigationController.java index 78069ad216..a7f49980ed 100644 --- a/src/main/java/com/divudi/bean/lab/InvestigationController.java +++ b/src/main/java/com/divudi/bean/lab/InvestigationController.java @@ -26,7 +26,6 @@ import com.divudi.entity.Institution; import com.divudi.entity.Item; import com.divudi.entity.ItemFee; -import com.divudi.entity.clinical.ClinicalEntity; import com.divudi.entity.lab.Investigation; import com.divudi.entity.lab.InvestigationCategory; import com.divudi.entity.lab.InvestigationItem; @@ -63,7 +62,6 @@ import java.util.logging.Logger; import java.util.stream.Collectors; import javax.ejb.EJB; -import javax.enterprise.context.Dependent; import javax.enterprise.context.SessionScoped; import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; diff --git a/src/main/java/com/divudi/bean/lab/PatientInvestigationController.java b/src/main/java/com/divudi/bean/lab/PatientInvestigationController.java index c522293017..132540e600 100644 --- a/src/main/java/com/divudi/bean/lab/PatientInvestigationController.java +++ b/src/main/java/com/divudi/bean/lab/PatientInvestigationController.java @@ -13,7 +13,6 @@ import com.divudi.data.InvestigationReportType; import com.divudi.data.ItemType; import com.divudi.data.MessageType; -import com.divudi.data.SmsSentResponse; import com.divudi.data.lab.Dimension; import com.divudi.data.lab.DimensionTestResult; import com.divudi.data.lab.SampleRequestType; diff --git a/src/main/java/com/divudi/bean/lab/PatientReportController.java b/src/main/java/com/divudi/bean/lab/PatientReportController.java index e3fa913bcc..d6a5871ab8 100644 --- a/src/main/java/com/divudi/bean/lab/PatientReportController.java +++ b/src/main/java/com/divudi/bean/lab/PatientReportController.java @@ -15,7 +15,6 @@ import com.divudi.data.InvestigationReportType; import com.divudi.data.MessageType; import com.divudi.data.Sex; -import com.divudi.data.SmsSentResponse; import com.divudi.data.lab.Selectable; import com.divudi.ejb.EmailManagerEjb; import com.divudi.ejb.PatientReportBean; @@ -40,11 +39,9 @@ import com.divudi.facade.PatientReportItemValueFacade; import com.divudi.facade.SmsFacade; import com.divudi.facade.TestFlagFacade; -import com.divudi.facade.UserPreferenceFacade; import com.divudi.bean.common.util.JsfUtil; import com.divudi.entity.clinical.ClinicalFindingValue; import com.divudi.facade.ClinicalFindingValueFacade; -import com.divudi.java.CommonFunctions; import com.lowagie.text.DocumentException; import java.io.File; import java.io.FileOutputStream; diff --git a/src/main/java/com/divudi/bean/lab/PatientSampleController.java b/src/main/java/com/divudi/bean/lab/PatientSampleController.java index 82c671c254..d63fc591a0 100644 --- a/src/main/java/com/divudi/bean/lab/PatientSampleController.java +++ b/src/main/java/com/divudi/bean/lab/PatientSampleController.java @@ -8,14 +8,9 @@ */ package com.divudi.bean.lab; -import com.divudi.bean.common.CommonController; import com.divudi.bean.common.SessionController; -import com.divudi.entity.Category; -import com.divudi.entity.lab.Sample; -import com.divudi.facade.SampleFacade; import com.divudi.bean.common.util.JsfUtil; -import com.divudi.data.lab.PatientSampleWrapper; import com.divudi.entity.lab.PatientSample; import com.divudi.facade.PatientSampleFacade; import com.divudi.java.CommonFunctions; @@ -34,7 +29,6 @@ import javax.inject.Inject; import javax.inject.Named; import javax.persistence.TemporalType; -import kotlin.collections.ArrayDeque; /** * diff --git a/src/main/java/com/divudi/bean/lab/SampleController.java b/src/main/java/com/divudi/bean/lab/SampleController.java index e19f74d546..5b205c0f8f 100644 --- a/src/main/java/com/divudi/bean/lab/SampleController.java +++ b/src/main/java/com/divudi/bean/lab/SampleController.java @@ -8,10 +8,8 @@ */ package com.divudi.bean.lab; -import com.divudi.bean.common.CommonController; import com.divudi.bean.common.SessionController; -import com.divudi.entity.Category; import com.divudi.entity.lab.Sample; import com.divudi.facade.SampleFacade; import com.divudi.bean.common.util.JsfUtil; diff --git a/src/main/java/com/divudi/bean/membership/MembershipSchemeController.java b/src/main/java/com/divudi/bean/membership/MembershipSchemeController.java index 163a7dd481..7996a1eb69 100644 --- a/src/main/java/com/divudi/bean/membership/MembershipSchemeController.java +++ b/src/main/java/com/divudi/bean/membership/MembershipSchemeController.java @@ -11,13 +11,11 @@ import com.divudi.bean.common.SessionController; import com.divudi.entity.Institution; -import com.divudi.entity.Patient; import com.divudi.entity.membership.MembershipScheme; import com.divudi.facade.MembershipSchemeFacade; import com.divudi.bean.common.util.JsfUtil; import java.io.Serializable; import java.util.ArrayList; -import java.util.Calendar; import java.util.Date; import java.util.HashMap; import java.util.List; diff --git a/src/main/java/com/divudi/bean/opd/OpdBillController.java b/src/main/java/com/divudi/bean/opd/OpdBillController.java index b7a4ecb5cc..4c3f5541ca 100644 --- a/src/main/java/com/divudi/bean/opd/OpdBillController.java +++ b/src/main/java/com/divudi/bean/opd/OpdBillController.java @@ -16,7 +16,6 @@ import com.divudi.data.OpdBillingStrategy; import com.divudi.data.PaymentMethod; import com.divudi.data.Sex; -import com.divudi.data.SmsSentResponse; import com.divudi.data.Title; import com.divudi.data.dataStructure.BillListWithTotals; import com.divudi.data.dataStructure.ComponentDetail; diff --git a/src/main/java/com/divudi/bean/optician/OpticianRepairBillController.java b/src/main/java/com/divudi/bean/optician/OpticianRepairBillController.java index 0704459315..a09ac0bacb 100644 --- a/src/main/java/com/divudi/bean/optician/OpticianRepairBillController.java +++ b/src/main/java/com/divudi/bean/optician/OpticianRepairBillController.java @@ -1,6 +1,5 @@ package com.divudi.bean.optician; -import com.divudi.bean.opd.*; import com.divudi.bean.cashTransaction.FinancialTransactionController; import com.divudi.bean.common.*; import com.divudi.bean.collectingCentre.CollectingCentreBillController; @@ -17,7 +16,6 @@ import com.divudi.data.OpdBillingStrategy; import com.divudi.data.PaymentMethod; import com.divudi.data.Sex; -import com.divudi.data.SmsSentResponse; import com.divudi.data.Title; import com.divudi.data.dataStructure.BillListWithTotals; import com.divudi.data.dataStructure.ComponentDetail; @@ -54,7 +52,6 @@ import com.divudi.entity.WebUser; import com.divudi.entity.hr.WorkingTime; import com.divudi.entity.lab.Investigation; -import com.divudi.entity.membership.MembershipScheme; import com.divudi.facade.BillComponentFacade; import com.divudi.facade.BillFacade; import com.divudi.facade.BillFeeFacade; diff --git a/src/main/java/com/divudi/bean/optician/OpticianSaleController.java b/src/main/java/com/divudi/bean/optician/OpticianSaleController.java index 6affc2be83..88367367ce 100644 --- a/src/main/java/com/divudi/bean/optician/OpticianSaleController.java +++ b/src/main/java/com/divudi/bean/optician/OpticianSaleController.java @@ -24,7 +24,6 @@ import com.divudi.data.BillNumberSuffix; import com.divudi.data.BillType; import com.divudi.data.BillTypeAtomic; -import com.divudi.data.OptionScope; import com.divudi.data.PaymentMethod; import com.divudi.data.Sex; import com.divudi.data.Title; @@ -46,12 +45,10 @@ import com.divudi.entity.Patient; import com.divudi.entity.Payment; import com.divudi.entity.PaymentScheme; -import com.divudi.entity.Person; import com.divudi.entity.PreBill; import com.divudi.entity.PriceMatrix; import com.divudi.entity.Staff; import com.divudi.entity.Token; -import com.divudi.entity.membership.MembershipScheme; import com.divudi.entity.pharmacy.Amp; import com.divudi.entity.pharmacy.ItemBatch; import com.divudi.entity.pharmacy.PharmaceuticalBillItem; diff --git a/src/main/java/com/divudi/bean/pharmacy/ConsumableCategoryController.java b/src/main/java/com/divudi/bean/pharmacy/ConsumableCategoryController.java index 35f2df9291..bfbf36a286 100644 --- a/src/main/java/com/divudi/bean/pharmacy/ConsumableCategoryController.java +++ b/src/main/java/com/divudi/bean/pharmacy/ConsumableCategoryController.java @@ -5,7 +5,6 @@ import com.divudi.bean.common.util.JsfUtil; import com.divudi.bean.common.util.JsfUtil.PersistAction; import java.io.Serializable; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -19,7 +18,6 @@ import javax.faces.convert.Converter; import javax.faces.convert.FacesConverter; import javax.inject.Named; -import javax.persistence.TemporalType; @Named("consumableCategoryController") @SessionScoped diff --git a/src/main/java/com/divudi/bean/pharmacy/DosageFormController.java b/src/main/java/com/divudi/bean/pharmacy/DosageFormController.java index 4fd6dcba49..fa3443559a 100644 --- a/src/main/java/com/divudi/bean/pharmacy/DosageFormController.java +++ b/src/main/java/com/divudi/bean/pharmacy/DosageFormController.java @@ -10,7 +10,6 @@ import com.divudi.bean.common.SessionController; -import com.divudi.entity.clinical.ClinicalEntity; import com.divudi.facade.DosageFormFacade; import com.divudi.bean.common.util.JsfUtil; diff --git a/src/main/java/com/divudi/bean/pharmacy/GrnController.java b/src/main/java/com/divudi/bean/pharmacy/GrnController.java index fa6dbc33c2..6abd653fd8 100644 --- a/src/main/java/com/divudi/bean/pharmacy/GrnController.java +++ b/src/main/java/com/divudi/bean/pharmacy/GrnController.java @@ -121,27 +121,27 @@ public class GrnController implements Serializable { private BillItem currentBillItem; BillItem currentExpense; List billExpenses; - - public void closeSelectedPurchesOrder(){ - if (closeBill==null) { + + public void closeSelectedPurchesOrder() { + if (closeBill == null) { JsfUtil.addErrorMessage("Bill is Not Valid !"); return; } - + closeBill.setBillClosed(true); billFacade.edit(closeBill); - + } - - public void openSelectedPurchesOrder(){ - if (closeBill==null) { + + public void openSelectedPurchesOrder() { + if (closeBill == null) { JsfUtil.addErrorMessage("Bill is Not Valid !"); return; } - + closeBill.setBillClosed(false); billFacade.edit(closeBill); - + } public double calDifference() { @@ -369,11 +369,11 @@ public void request() { getCurrentGrnBillPre().setInvoiceDate(invoiceDate); getCurrentGrnBillPre().setInvoiceNumber(invoiceNumber); getCurrentGrnBillPre().setPaymentMethod(getApproveBill().getPaymentMethod()); - + if (getCurrentGrnBillPre().getInvoiceDate() == null) { getCurrentGrnBillPre().setInvoiceDate(getApproveBill().getCreatedAt()); } - + String msg = pharmacyCalculation.errorCheck(getCurrentGrnBillPre(), billItems); if (!msg.isEmpty()) { JsfUtil.addErrorMessage(msg); @@ -432,7 +432,7 @@ public void request() { // saveBillFee(i, p); getCurrentGrnBillPre().getBillItems().add(i); } - for (BillItem bi:getCurrentGrnBillPre().getBillItems()){ + for (BillItem bi : getCurrentGrnBillPre().getBillItems()) { System.out.println("bi = " + bi.getItem().getName()); System.out.println("** = " + bi.getPharmaceuticalBillItem().getItemBatch().getItem().getName()); } @@ -587,6 +587,10 @@ public void settle() { continue; } + if (i.getTmpQty() < 0.0 && i.getTmpFreeQty() < 0.0) { + continue; + } + PharmaceuticalBillItem ph = i.getPharmaceuticalBillItem(); i.setPharmaceuticalBillItem(null); @@ -642,7 +646,7 @@ public void settle() { getGrnBill().setExpenseTotal(calExpenses()); calGrossTotal(); getGrnBill().setNetTotal(getGrnBill().getNetTotal() - calExpenses()); - + pharmacyCalculation.calculateRetailSaleValueAndFreeValueAtPurchaseRate(getGrnBill()); updateBalanceForGrn(getGrnBill()); @@ -862,7 +866,7 @@ public void saveGrnPreBill() { } else { getBillFacade().edit(getCurrentGrnBillPre()); } - + getApproveBill().setReferenceBill(getCurrentGrnBillPre()); getBillFacade().edit(getApproveBill()); } @@ -882,10 +886,10 @@ public void saveBill() { // getGrnBill().setInsId(getBillNumberBean().institutionBillNumberGenerator(getSessionController().getInstitution(), getGrnBill(), BillType.PharmacyGrnBill, BillNumberSuffix.GRN)); getGrnBill().setBillTypeAtomic(BillTypeAtomic.PHARMACY_GRN); if (getCurrentGrnBillPre() != null) { - - if(getCurrentGrnBillPre().getId()==null){ + + if (getCurrentGrnBillPre().getId() == null) { billFacade.create(getCurrentGrnBillPre()); - }else{ + } else { billFacade.edit(getCurrentGrnBillPre()); } getCurrentGrnBillPre().setForwardReferenceBill(getGrnBill()); @@ -1073,25 +1077,28 @@ public void onEdit(RowEditEvent event) { onEdit(tmp); } + public void checkQty(BillItem bi) { + + if (bi.getTmpQty() < 0.0) { + bi.setTmpQty(0.0); + } + + if (bi.getTmpFreeQty() < 0.0) { + bi.setTmpFreeQty(0.0); + } + + onEdit(bi); + } + public void onEdit(BillItem tmp) { setBatch(tmp); double remains = getPharmacyCalculation().getRemainingQty(tmp.getPharmaceuticalBillItem()); -// System.err.println("1 " + tmp.getTmpQty()); -// System.err.println("2 " + tmp.getQty()); -// System.err.println("3 " + tmp.getPharmaceuticalBillItem().getQty()); -// System.err.println("4 " + tmp.getPharmaceuticalBillItem().getQtyInUnit()); -//System.out.println("remains = " + remains); -// System.out.println("tmp.getPharmaceuticalBillItem().getQtyInUnit() = " + tmp.getPharmaceuticalBillItem().getQtyInUnit()); + if (remains < tmp.getPharmaceuticalBillItem().getQtyInUnit()) { tmp.setTmpQty(remains); JsfUtil.addErrorMessage("You cant Change Qty than Remaining qty"); } -// System.out.println("tmp.getPreviousRecieveQtyInUnit() = " + tmp.getPreviousRecieveQtyInUnit()); -// if(tmp.getPreviousRecieveQtyInUnit() < tmp.getPharmaceuticalBillItem().getQtyInUnit()){ -// tmp.setTmpQty(tmp.getPreviousRecieveQtyInUnit()); -// JsfUtil.addErrorMessage("You cant Order Qty than Remaining qty to recieve"); -// } if (tmp.getPharmaceuticalBillItem().getPurchaseRate() > tmp.getPharmaceuticalBillItem().getRetailRate()) { tmp.getPharmaceuticalBillItem().setRetailRate(getRetailPrice(tmp.getPharmaceuticalBillItem().getBillItem())); @@ -1105,8 +1112,6 @@ public void onEdit(BillItem tmp) { // return; } } -// manually set Wholesale Rate************** -// tmp.getPharmaceuticalBillItem().setWholesaleRate((tmp.getPharmaceuticalBillItem().getPurchaseRate() * 1.08)* (tmp.getPharmaceuticalBillItem().getQtyInUnit())/(tmp.getPharmaceuticalBillItem().getQtyInUnit() + tmp.getPharmaceuticalBillItem().getFreeQtyInUnit()) ); calGrossTotal(); calDifference(); @@ -1119,21 +1124,6 @@ public void onEditPurchaseRate(BillItem tmp) { } -// private List getSuggession(Item item) { -// List suggessions = new ArrayList<>(); -// -// if (item instanceof Amp) { -// suggessions = getPharmacyBillBean().findItem((Amp) item, suggessions); -// } else if (item instanceof Ampp) { -// suggessions = getPharmacyBillBean().findItem((Ampp) item, suggessions); -// } else if (item instanceof Vmp) { -// suggessions = getPharmacyBillBean().findItem((Vmp) item, suggessions); -// } else if (item instanceof Vmpp) { -// suggessions = getPharmacyBillBean().findItem((Vmpp) item, suggessions); -// } -// -// return suggessions; -// } public void calGrossTotal() { double tmp = 0.0; int serialNo = 0; @@ -1226,7 +1216,7 @@ public void createBillFeePaymentAndPayment(BillFee bf, Payment p) { bfp.setPayment(p); getBillFeePaymentFacade().create(bfp); } - + public BillItem getCurrentExpense() { if (currentExpense == null) { currentExpense = new BillItem(); @@ -1234,7 +1224,7 @@ public BillItem getCurrentExpense() { } return currentExpense; } - + public BilledBill getBill() { if (bill == null) { bill = new BilledBill(); @@ -1243,7 +1233,7 @@ public BilledBill getBill() { } return bill; } - + public void addExpense() { if (getBill().getId() == null) { getBillFacade().create(getBill()); @@ -1265,17 +1255,17 @@ public void addExpense() { getCurrentExpense().setSearialNo(getBillExpenses().size()); getBillExpenses().add(currentExpense); currentExpense = null; - + } - - public double calExpenses(){ + + public double calExpenses() { double tot = 0.0; - for (BillItem be : billExpenses){ + for (BillItem be : billExpenses) { tot = tot + be.getNetValue(); } return tot; } - + public void calTotal() { double tot = 0.0; double exp = 0.0; diff --git a/src/main/java/com/divudi/bean/pharmacy/PharmaceuticalItemCategoryController.java b/src/main/java/com/divudi/bean/pharmacy/PharmaceuticalItemCategoryController.java index ada9f942a8..e24ac114de 100644 --- a/src/main/java/com/divudi/bean/pharmacy/PharmaceuticalItemCategoryController.java +++ b/src/main/java/com/divudi/bean/pharmacy/PharmaceuticalItemCategoryController.java @@ -10,7 +10,6 @@ import com.divudi.bean.common.SessionController; -import com.divudi.entity.clinical.ClinicalEntity; import com.divudi.entity.pharmacy.PharmaceuticalItemCategory; import com.divudi.facade.PharmaceuticalItemCategoryFacade; import com.divudi.bean.common.util.JsfUtil; diff --git a/src/main/java/com/divudi/bean/pharmacy/PharmaceuticalItemController.java b/src/main/java/com/divudi/bean/pharmacy/PharmaceuticalItemController.java index 126be35090..f28679deb4 100644 --- a/src/main/java/com/divudi/bean/pharmacy/PharmaceuticalItemController.java +++ b/src/main/java/com/divudi/bean/pharmacy/PharmaceuticalItemController.java @@ -7,7 +7,6 @@ import com.divudi.entity.pharmacy.PharmaceuticalItem; import com.divudi.facade.PharmaceuticalItemFacade; import java.io.Serializable; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/com/divudi/bean/pharmacy/PharmacyAdjustmentController.java b/src/main/java/com/divudi/bean/pharmacy/PharmacyAdjustmentController.java index 3917dcf47e..3da8c7075d 100644 --- a/src/main/java/com/divudi/bean/pharmacy/PharmacyAdjustmentController.java +++ b/src/main/java/com/divudi/bean/pharmacy/PharmacyAdjustmentController.java @@ -23,7 +23,6 @@ import com.divudi.entity.pharmacy.Amp; import com.divudi.entity.pharmacy.ItemBatch; import com.divudi.entity.pharmacy.PharmaceuticalBillItem; -import com.divudi.entity.pharmacy.AdjustmentBillItem; import com.divudi.entity.pharmacy.Stock; import com.divudi.facade.BillFacade; import com.divudi.facade.BillItemFacade; diff --git a/src/main/java/com/divudi/bean/pharmacy/PharmacyBillSearch.java b/src/main/java/com/divudi/bean/pharmacy/PharmacyBillSearch.java index ec09f3e3c7..4f1c95e6b7 100644 --- a/src/main/java/com/divudi/bean/pharmacy/PharmacyBillSearch.java +++ b/src/main/java/com/divudi/bean/pharmacy/PharmacyBillSearch.java @@ -7,7 +7,6 @@ import com.divudi.bean.common.BillBeanController; import com.divudi.bean.common.PriceMatrixController; import com.divudi.bean.common.SessionController; -import com.divudi.bean.common.util.JsfUtil; import com.divudi.bean.common.WebUserController; import com.divudi.bean.inward.InwardBeanController; import com.divudi.bean.store.StoreBillSearch; diff --git a/src/main/java/com/divudi/bean/pharmacy/PharmacyRequestForBhtController.java b/src/main/java/com/divudi/bean/pharmacy/PharmacyRequestForBhtController.java index c1e0f9ea97..a506b0edb0 100644 --- a/src/main/java/com/divudi/bean/pharmacy/PharmacyRequestForBhtController.java +++ b/src/main/java/com/divudi/bean/pharmacy/PharmacyRequestForBhtController.java @@ -41,7 +41,6 @@ import com.divudi.entity.pharmacy.Amp; import com.divudi.entity.pharmacy.PharmaceuticalBillItem; import com.divudi.entity.pharmacy.Stock; -import com.divudi.entity.pharmacy.UserStock; import com.divudi.entity.pharmacy.UserStockContainer; import com.divudi.facade.BillFacade; import com.divudi.facade.BillFeeFacade; diff --git a/src/main/java/com/divudi/bean/pharmacy/PharmacySaleBhtController.java b/src/main/java/com/divudi/bean/pharmacy/PharmacySaleBhtController.java index 6670944599..441f7bfade 100644 --- a/src/main/java/com/divudi/bean/pharmacy/PharmacySaleBhtController.java +++ b/src/main/java/com/divudi/bean/pharmacy/PharmacySaleBhtController.java @@ -37,7 +37,6 @@ import com.divudi.entity.PatientEncounter; import com.divudi.entity.PreBill; import com.divudi.entity.PriceMatrix; -import com.divudi.entity.UserNotification; import com.divudi.entity.pharmacy.Amp; import com.divudi.entity.pharmacy.Ampp; import com.divudi.entity.pharmacy.PharmaceuticalBillItem; diff --git a/src/main/java/com/divudi/bean/pharmacy/PharmacySaleController.java b/src/main/java/com/divudi/bean/pharmacy/PharmacySaleController.java index 321799c26b..42bbd1a1ba 100644 --- a/src/main/java/com/divudi/bean/pharmacy/PharmacySaleController.java +++ b/src/main/java/com/divudi/bean/pharmacy/PharmacySaleController.java @@ -23,7 +23,6 @@ import com.divudi.data.BillNumberSuffix; import com.divudi.data.BillType; import com.divudi.data.BillTypeAtomic; -import com.divudi.data.OptionScope; import com.divudi.data.PaymentMethod; import com.divudi.data.Sex; import com.divudi.data.Title; @@ -47,12 +46,10 @@ import com.divudi.entity.Patient; import com.divudi.entity.Payment; import com.divudi.entity.PaymentScheme; -import com.divudi.entity.Person; import com.divudi.entity.PreBill; import com.divudi.entity.PriceMatrix; import com.divudi.entity.Staff; import com.divudi.entity.Token; -import com.divudi.entity.membership.MembershipScheme; import com.divudi.entity.pharmacy.Amp; import com.divudi.entity.pharmacy.ItemBatch; import com.divudi.entity.pharmacy.PharmaceuticalBillItem; diff --git a/src/main/java/com/divudi/bean/pharmacy/PharmacySaleController1.java b/src/main/java/com/divudi/bean/pharmacy/PharmacySaleController1.java index 93a04efd35..c843f35b9f 100644 --- a/src/main/java/com/divudi/bean/pharmacy/PharmacySaleController1.java +++ b/src/main/java/com/divudi/bean/pharmacy/PharmacySaleController1.java @@ -23,7 +23,6 @@ import com.divudi.data.BillNumberSuffix; import com.divudi.data.BillType; import com.divudi.data.BillTypeAtomic; -import com.divudi.data.OptionScope; import com.divudi.data.PaymentMethod; import com.divudi.data.Sex; import com.divudi.data.Title; @@ -47,12 +46,10 @@ import com.divudi.entity.Patient; import com.divudi.entity.Payment; import com.divudi.entity.PaymentScheme; -import com.divudi.entity.Person; import com.divudi.entity.PreBill; import com.divudi.entity.PriceMatrix; import com.divudi.entity.Staff; import com.divudi.entity.Token; -import com.divudi.entity.membership.MembershipScheme; import com.divudi.entity.pharmacy.Amp; import com.divudi.entity.pharmacy.ItemBatch; import com.divudi.entity.pharmacy.PharmaceuticalBillItem; diff --git a/src/main/java/com/divudi/bean/pharmacy/PharmacySaleController2.java b/src/main/java/com/divudi/bean/pharmacy/PharmacySaleController2.java index e3a93c288a..54bed337f8 100644 --- a/src/main/java/com/divudi/bean/pharmacy/PharmacySaleController2.java +++ b/src/main/java/com/divudi/bean/pharmacy/PharmacySaleController2.java @@ -23,7 +23,6 @@ import com.divudi.data.BillNumberSuffix; import com.divudi.data.BillType; import com.divudi.data.BillTypeAtomic; -import com.divudi.data.OptionScope; import com.divudi.data.PaymentMethod; import com.divudi.data.Sex; import com.divudi.data.Title; @@ -47,12 +46,10 @@ import com.divudi.entity.Patient; import com.divudi.entity.Payment; import com.divudi.entity.PaymentScheme; -import com.divudi.entity.Person; import com.divudi.entity.PreBill; import com.divudi.entity.PriceMatrix; import com.divudi.entity.Staff; import com.divudi.entity.Token; -import com.divudi.entity.membership.MembershipScheme; import com.divudi.entity.pharmacy.Amp; import com.divudi.entity.pharmacy.ItemBatch; import com.divudi.entity.pharmacy.PharmaceuticalBillItem; diff --git a/src/main/java/com/divudi/bean/pharmacy/PharmacySaleController3.java b/src/main/java/com/divudi/bean/pharmacy/PharmacySaleController3.java index 5c828bade9..f507790d9f 100644 --- a/src/main/java/com/divudi/bean/pharmacy/PharmacySaleController3.java +++ b/src/main/java/com/divudi/bean/pharmacy/PharmacySaleController3.java @@ -23,7 +23,6 @@ import com.divudi.data.BillNumberSuffix; import com.divudi.data.BillType; import com.divudi.data.BillTypeAtomic; -import com.divudi.data.OptionScope; import com.divudi.data.PaymentMethod; import com.divudi.data.Sex; import com.divudi.data.Title; @@ -47,12 +46,10 @@ import com.divudi.entity.Patient; import com.divudi.entity.Payment; import com.divudi.entity.PaymentScheme; -import com.divudi.entity.Person; import com.divudi.entity.PreBill; import com.divudi.entity.PriceMatrix; import com.divudi.entity.Staff; import com.divudi.entity.Token; -import com.divudi.entity.membership.MembershipScheme; import com.divudi.entity.pharmacy.Amp; import com.divudi.entity.pharmacy.ItemBatch; import com.divudi.entity.pharmacy.PharmaceuticalBillItem; diff --git a/src/main/java/com/divudi/bean/pharmacy/PharmacySaleWithoutStockController.java b/src/main/java/com/divudi/bean/pharmacy/PharmacySaleWithoutStockController.java index ba2ecc186a..489b6df45a 100644 --- a/src/main/java/com/divudi/bean/pharmacy/PharmacySaleWithoutStockController.java +++ b/src/main/java/com/divudi/bean/pharmacy/PharmacySaleWithoutStockController.java @@ -42,11 +42,9 @@ import com.divudi.entity.PreBill; import com.divudi.entity.PriceMatrix; import com.divudi.entity.Staff; -import com.divudi.entity.membership.MembershipScheme; import com.divudi.entity.pharmacy.Amp; import com.divudi.entity.pharmacy.PharmaceuticalBillItem; import com.divudi.entity.pharmacy.Stock; -import com.divudi.entity.pharmacy.UserStock; import com.divudi.entity.pharmacy.UserStockContainer; import com.divudi.facade.BillFacade; import com.divudi.facade.BillFeeFacade; diff --git a/src/main/java/com/divudi/bean/pharmacy/PharmacyWholeSaleController.java b/src/main/java/com/divudi/bean/pharmacy/PharmacyWholeSaleController.java index 086467e91f..887fd1ba1a 100644 --- a/src/main/java/com/divudi/bean/pharmacy/PharmacyWholeSaleController.java +++ b/src/main/java/com/divudi/bean/pharmacy/PharmacyWholeSaleController.java @@ -40,7 +40,6 @@ import com.divudi.entity.PreBill; import com.divudi.entity.PriceMatrix; import com.divudi.entity.Staff; -import com.divudi.entity.membership.MembershipScheme; import com.divudi.entity.pharmacy.Amp; import com.divudi.entity.pharmacy.PharmaceuticalBillItem; import com.divudi.entity.pharmacy.Stock; diff --git a/src/main/java/com/divudi/bean/pharmacy/PharmacyWholeSaleController1.java b/src/main/java/com/divudi/bean/pharmacy/PharmacyWholeSaleController1.java index 20935c25c2..0a88113f9f 100644 --- a/src/main/java/com/divudi/bean/pharmacy/PharmacyWholeSaleController1.java +++ b/src/main/java/com/divudi/bean/pharmacy/PharmacyWholeSaleController1.java @@ -40,7 +40,6 @@ import com.divudi.entity.PreBill; import com.divudi.entity.PriceMatrix; import com.divudi.entity.Staff; -import com.divudi.entity.membership.MembershipScheme; import com.divudi.entity.pharmacy.Amp; import com.divudi.entity.pharmacy.PharmaceuticalBillItem; import com.divudi.entity.pharmacy.Stock; diff --git a/src/main/java/com/divudi/bean/pharmacy/PharmacyWholeSaleController2.java b/src/main/java/com/divudi/bean/pharmacy/PharmacyWholeSaleController2.java index 259a39a617..957e24b000 100644 --- a/src/main/java/com/divudi/bean/pharmacy/PharmacyWholeSaleController2.java +++ b/src/main/java/com/divudi/bean/pharmacy/PharmacyWholeSaleController2.java @@ -40,7 +40,6 @@ import com.divudi.entity.PreBill; import com.divudi.entity.PriceMatrix; import com.divudi.entity.Staff; -import com.divudi.entity.membership.MembershipScheme; import com.divudi.entity.pharmacy.Amp; import com.divudi.entity.pharmacy.PharmaceuticalBillItem; import com.divudi.entity.pharmacy.Stock; diff --git a/src/main/java/com/divudi/bean/pharmacy/PharmacyWholeSaleController3.java b/src/main/java/com/divudi/bean/pharmacy/PharmacyWholeSaleController3.java index dfd4178753..59b1647f1b 100644 --- a/src/main/java/com/divudi/bean/pharmacy/PharmacyWholeSaleController3.java +++ b/src/main/java/com/divudi/bean/pharmacy/PharmacyWholeSaleController3.java @@ -40,7 +40,6 @@ import com.divudi.entity.PreBill; import com.divudi.entity.PriceMatrix; import com.divudi.entity.Staff; -import com.divudi.entity.membership.MembershipScheme; import com.divudi.entity.pharmacy.Amp; import com.divudi.entity.pharmacy.PharmaceuticalBillItem; import com.divudi.entity.pharmacy.Stock; diff --git a/src/main/java/com/divudi/bean/pharmacy/PurchaseOrderRequestController.java b/src/main/java/com/divudi/bean/pharmacy/PurchaseOrderRequestController.java index 1d5ab5f49f..0f17149bad 100644 --- a/src/main/java/com/divudi/bean/pharmacy/PurchaseOrderRequestController.java +++ b/src/main/java/com/divudi/bean/pharmacy/PurchaseOrderRequestController.java @@ -31,7 +31,6 @@ import com.divudi.facade.PharmaceuticalBillItemFacade; import com.divudi.bean.common.util.JsfUtil; import com.divudi.data.BillTypeAtomic; -import com.divudi.data.OptionScope; import com.divudi.data.dataStructure.PaymentMethodData; import java.io.Serializable; import java.util.ArrayList; diff --git a/src/main/java/com/divudi/bean/pharmacy/ReorderController.java b/src/main/java/com/divudi/bean/pharmacy/ReorderController.java index 24e5704074..dfc8e8fbd8 100644 --- a/src/main/java/com/divudi/bean/pharmacy/ReorderController.java +++ b/src/main/java/com/divudi/bean/pharmacy/ReorderController.java @@ -33,7 +33,6 @@ import com.divudi.bean.common.util.JsfUtil; import com.divudi.entity.pharmacy.Amp; import com.divudi.java.CommonFunctions; -import com.google.common.collect.HashBiMap; import java.io.Serializable; import java.text.DateFormat; import java.text.SimpleDateFormat; diff --git a/src/main/java/com/divudi/bean/pharmacy/ReportsStock.java b/src/main/java/com/divudi/bean/pharmacy/ReportsStock.java index 7799c8bf52..d0e09ca2ef 100644 --- a/src/main/java/com/divudi/bean/pharmacy/ReportsStock.java +++ b/src/main/java/com/divudi/bean/pharmacy/ReportsStock.java @@ -13,7 +13,6 @@ import com.divudi.data.dataStructure.PharmacyStockRow; import com.divudi.data.dataStructure.StockReportRecord; import com.divudi.data.hr.ReportKeyWord; -import com.divudi.entity.Bill; import com.divudi.entity.BillItem; import com.divudi.entity.BilledBill; import com.divudi.entity.CancelledBill; @@ -29,7 +28,6 @@ import com.divudi.entity.pharmacy.Stock; import com.divudi.entity.pharmacy.StockHistory; import com.divudi.entity.pharmacy.Vmp; -import com.divudi.facade.BillFacade; import com.divudi.facade.BillItemFacade; import com.divudi.facade.ItemFacade; import com.divudi.facade.PharmaceuticalBillItemFacade; diff --git a/src/main/java/com/divudi/bean/pharmacy/StockController.java b/src/main/java/com/divudi/bean/pharmacy/StockController.java index bd6e325667..f430eacdd7 100644 --- a/src/main/java/com/divudi/bean/pharmacy/StockController.java +++ b/src/main/java/com/divudi/bean/pharmacy/StockController.java @@ -39,7 +39,6 @@ import javax.faces.convert.FacesConverter; import javax.inject.Inject; import javax.inject.Named; -import org.primefaces.PrimeFaces; /** * diff --git a/src/main/java/com/divudi/bean/pharmacy/TransferIssueController.java b/src/main/java/com/divudi/bean/pharmacy/TransferIssueController.java index 97c018b6cc..fc9df77db4 100644 --- a/src/main/java/com/divudi/bean/pharmacy/TransferIssueController.java +++ b/src/main/java/com/divudi/bean/pharmacy/TransferIssueController.java @@ -8,14 +8,12 @@ import com.divudi.bean.common.CommonController; import com.divudi.bean.common.NotificationController; import com.divudi.bean.common.SessionController; -import com.divudi.bean.common.UserNotificationController; import com.divudi.bean.common.util.JsfUtil; import com.divudi.data.BillClassType; import com.divudi.data.BillNumberSuffix; import com.divudi.data.BillType; import com.divudi.data.BillTypeAtomic; import com.divudi.data.StockQty; -import com.divudi.data.inward.InwardChargeType; import com.divudi.ejb.BillNumberGenerator; import com.divudi.ejb.PharmacyBean; diff --git a/src/main/java/com/divudi/bean/pharmacy/VmppController.java b/src/main/java/com/divudi/bean/pharmacy/VmppController.java index 94b9596a2c..2eeb778108 100644 --- a/src/main/java/com/divudi/bean/pharmacy/VmppController.java +++ b/src/main/java/com/divudi/bean/pharmacy/VmppController.java @@ -8,32 +8,16 @@ */ package com.divudi.bean.pharmacy; -import com.divudi.bean.common.BillBeanController; -import com.divudi.bean.common.CommonController; import com.divudi.bean.common.SessionController; import com.divudi.bean.common.util.JsfUtil; -import com.divudi.data.SymanticType; -import com.divudi.entity.Category; -import com.divudi.entity.Item; -import com.divudi.entity.pharmacy.Amp; -import com.divudi.entity.pharmacy.MeasurementUnit; -import com.divudi.entity.pharmacy.PharmaceuticalItem; import com.divudi.entity.pharmacy.Vmpp; -import com.divudi.entity.pharmacy.Vtm; -import com.divudi.entity.pharmacy.VirtualProductIngredient; -import com.divudi.facade.AmpFacade; -import com.divudi.facade.SpecialityFacade; import com.divudi.facade.VmppFacade; -import com.divudi.facade.VirtualProductIngredientFacade; import java.io.Serializable; import java.util.ArrayList; -import java.util.Arrays; import java.util.Date; import java.util.HashMap; -import java.util.LinkedHashSet; import java.util.List; import java.util.Map; -import java.util.regex.Pattern; import javax.ejb.EJB; import javax.enterprise.context.SessionScoped; import javax.faces.component.UIComponent; diff --git a/src/main/java/com/divudi/bean/report/CommonReport.java b/src/main/java/com/divudi/bean/report/CommonReport.java index 75ff9cc31a..fbe35160a6 100644 --- a/src/main/java/com/divudi/bean/report/CommonReport.java +++ b/src/main/java/com/divudi/bean/report/CommonReport.java @@ -36,7 +36,6 @@ import com.divudi.facade.InstitutionFacade; import com.divudi.facade.PriceMatrixFacade; import com.divudi.bean.common.util.JsfUtil; -import com.divudi.data.InstitutionType; import com.divudi.java.CommonFunctions; import java.io.Serializable; import java.util.ArrayList; diff --git a/src/main/java/com/divudi/bean/report/ReportController.java b/src/main/java/com/divudi/bean/report/ReportController.java index ca35470090..7ad93cd25e 100644 --- a/src/main/java/com/divudi/bean/report/ReportController.java +++ b/src/main/java/com/divudi/bean/report/ReportController.java @@ -4,7 +4,6 @@ import com.divudi.bean.common.InstitutionController; import com.divudi.bean.common.ItemApplicationController; import com.divudi.bean.common.ItemController; -import com.divudi.bean.common.PatientController; import com.divudi.bean.common.PersonController; import com.divudi.bean.common.util.JsfUtil; import com.divudi.data.BillItemStatus; @@ -36,7 +35,6 @@ import com.divudi.java.CommonFunctions; import com.divudi.light.common.BillLight; import com.divudi.light.common.PrescriptionSummaryReportRow; -import java.io.FileOutputStream; import java.io.IOException; import javax.inject.Named; import javax.enterprise.context.SessionScoped; diff --git a/src/main/java/com/divudi/bean/store/StoreAdjustmentController.java b/src/main/java/com/divudi/bean/store/StoreAdjustmentController.java index bbd2be82d1..1a4b01e99a 100644 --- a/src/main/java/com/divudi/bean/store/StoreAdjustmentController.java +++ b/src/main/java/com/divudi/bean/store/StoreAdjustmentController.java @@ -7,6 +7,7 @@ import com.divudi.bean.common.SessionController; import com.divudi.bean.common.util.JsfUtil; +import com.divudi.bean.pharmacy.ConsumableCategoryController; import com.divudi.data.BillClassType; import com.divudi.data.BillNumberSuffix; import com.divudi.data.BillType; @@ -627,5 +628,58 @@ public YearMonthDay getYearMonthDay() { public void setYearMonthDay(YearMonthDay yearMonthDay) { this.yearMonthDay = yearMonthDay; } + private List stk; + public void fillSelectStock() { + List items = new ArrayList<>(); + if (stock == null) { + stk = items; + return; + } + String sql; + Map m = new HashMap<>(); + + sql = "select i " + + " from Stock i " + + " where i.department=:d " + + " and i.itemBatch.item.code=:stationary " + + " order by i.stock desc"; + + m.put("d", sessionController.getDepartment()); + m.put("stationary", stock.getItemBatch().getItem().getCode()); // Assuming stk contains the item + + items = getStockFacade().findByJpql(sql, m); + + if (items != null) { + stk = items; + } + } + + public List getStk() { + return stk; + } + + public void setStk(List stk) { + this.stk = stk; + } + + + + + + public void fillSelectStock(){ + List items = new ArrayList<>(); + + String sql; + Map m = new HashMap(); + sql = "select i " + + " from Stock i " + + " where i.department=:d " + + " order by i.stock desc"; + m.put("d", sessionController.getDepartment()); + + items = getStockFacade().findByJpql(sql, m); + + + } } diff --git a/src/main/java/com/divudi/data/BillTypeAtomic.java b/src/main/java/com/divudi/data/BillTypeAtomic.java index 02f0a19c2b..03af8bf1e9 100644 --- a/src/main/java/com/divudi/data/BillTypeAtomic.java +++ b/src/main/java/com/divudi/data/BillTypeAtomic.java @@ -166,6 +166,7 @@ public enum BillTypeAtomic { PROFESSIONAL_PAYMENT_FOR_STAFF_FOR_OPD_SERVICES_RETURN("OPD Professional Payment bill - Return and Cancellation", BillCategory.PAYMENTS, ServiceType.OPD, BillFinanceType.CASH_IN, CountedServiceType.OPD_PROFESSIONAL_PAYMENT_RETURN), PETTY_CASH_ISSUE("Petty Cash Issue", BillCategory.PAYMENTS, ServiceType.OTHER, BillFinanceType.CASH_OUT, CountedServiceType.OTHER), PETTY_CASH_RETURN("Petty Cash Return", BillCategory.BILL, ServiceType.OTHER, BillFinanceType.CASH_IN, CountedServiceType.OTHER), + PETTY_CASH_BILL_CANCELLATION("Petty Cash Bill Cancellation", BillCategory.CANCELLATION, ServiceType.OTHER, BillFinanceType.NO_FINANCE_TRANSACTIONS, CountedServiceType.OTHER), IOU_CASH_ISSUE("Iou Cash Issue", BillCategory.BILL, ServiceType.OTHER, BillFinanceType.CASH_OUT, CountedServiceType.OTHER), IOU_CASH_RETURN("Iou Cash Return", BillCategory.BILL, ServiceType.OTHER, BillFinanceType.CASH_IN, CountedServiceType.OTHER), STAFF_CREDIT_SETTLE("Staff Credit Settle", BillCategory.BILL, ServiceType.OTHER, BillFinanceType.CASH_IN, CountedServiceType.OTHER), diff --git a/src/main/java/com/divudi/data/LoginPage.java b/src/main/java/com/divudi/data/LoginPage.java index 7d68953e34..237cb273fa 100644 --- a/src/main/java/com/divudi/data/LoginPage.java +++ b/src/main/java/com/divudi/data/LoginPage.java @@ -3,7 +3,7 @@ /** * Enum representing various page types * - * @author Dr M H B Ariyaratne + * Author: Dr M H B Ariyaratne * Contribution by OpenAI's ChatGPT for additional labels and method implementation. */ public enum LoginPage { @@ -12,24 +12,15 @@ public enum LoginPage { CHANNELLING_TV_DISPLAY("Channelling TV Display"), OPD_QUEUE_PAGE("OPD Queue Page"), OPD_TOKEN_DISPLAY("OPD Token Display"), - PHARMACY_TOKEN_DISPLAY("Pharmacy Token Display"); + PHARMACY_TOKEN_DISPLAY("Pharmacy Token Display"), + COURIER_LANDING_PAGE("Courier Landing Page"); private final String label; - /** - * Constructor for LoginPage enum to set the user-friendly label. - * - * @param label the user-friendly name of the page type - */ LoginPage(String label) { this.label = label; } - /** - * Returns the user-friendly name of the page type. - * - * @return the label of the enum constant - */ public String getLabel() { return label; } diff --git a/src/main/java/com/divudi/data/PaymentMethod.java b/src/main/java/com/divudi/data/PaymentMethod.java index ccc2a7a0b6..7162f4374b 100644 --- a/src/main/java/com/divudi/data/PaymentMethod.java +++ b/src/main/java/com/divudi/data/PaymentMethod.java @@ -1,8 +1,6 @@ package com.divudi.data; -import java.util.Arrays; import java.util.List; -import java.util.stream.Collectors; import java.lang.reflect.Field; import java.util.Arrays; diff --git a/src/main/java/com/divudi/data/Privileges.java b/src/main/java/com/divudi/data/Privileges.java index 3ce84aac20..a441740357 100644 --- a/src/main/java/com/divudi/data/Privileges.java +++ b/src/main/java/com/divudi/data/Privileges.java @@ -4,523 +4,562 @@ */ package com.divudi.data; -/** - * @author www.divudi.com - */ public enum Privileges { - //Main Menu Privileges - TheaterIssueBHT, - Opd, - Inward, - Lab, - Pharmacy, - Payment, - Hr, - Reports, - User, - Admin, - Channelling, - Clinical, - Store, - Search, - CashTransaction, - ChangeCreditLimitInCC, - //Submenu Privileges - OpdBilling, - OpdCollectingCentreBillingMenu, - OpdCollectingCentreBilling, - OpdCollectingCentreBillSearch, - OpdPreBilling, - OpdBillSearch, - OpdBillItemSearch, - OpdReprint, - OpdCancel, - OpdReturn, - OpdReactivate, - OpdBillSearchEdit, - OpdLabReportSearch, - OpdReprintOriginalBill, - - AddCreditLimitInRegistration, - - InwardAdmissions, - InwardAdmissionsAdmission, - InwardAdmissionsEditAdmission, - InwardAdmissionsInwardAppoinment, - InwardRoom, - InwardRoomRoomOccupency, - InwardRoomRoomChange, - InwardRoomGurdianRoomChange, - InwardRoomDischarge, - InwardServicesAndItems, - InwardServicesAndItemsAddServices, - InwardServicesAndItemsAddOutSideCharges, - InwardServicesAndItemsAddProfessionalFee, - InwardServicesAndItemsAddTimedServices, - InwardBilling, - InwardBillingInterimBill, - InwardBillingInterimBillSearch, - InwardSearch, - InwardSearchServiceBill, - InwardSearchProfessionalBill, - InwardSearchFinalBill, - InwardReport, - InwardFinalBillReportEdit, - InwardAdministration, - InwardAdditionalPrivilages, - InwardBillSearch, - InwardBillItemSearch, - InwardBillReprint, - InwardCancel, - InwardReturn, - InwardReactivate, - InwardCheck, - InwardUnCheck, - InwardFinalBillCancel, - InwardOutSideMarkAsUnPaid, - ShowInwardFee, - InwardPharmacyMenu, - InwardPharmacyIssueRequest, - InwardPharmacyIssueRequestSearch, - InwardBillSettleWithoutCheck, - LabBilling, - LabBillCancelSpecial, - LabBillRefundSpecial, - LabCasheirBillSearch, - LabCashier, - LabBillSearchCashier, - LabBillSearch, - LabBillItemSearch, - LabBillCancelling, - CollectingCentreCancelling, - LabBillReturning, - LabBillReprint, - LabBillRefunding, - LabBillReactivating, - LabSampleCollecting, - LabSampleReceiving, - LabReportFormatEditing, - LabDataentry, - LabAutherizing, - LabDeAutherizing, - LabRevertSample, - LabPrinting, - LabReprinting, - LabReportEdit, - LabReportPrint, - AdminReportSearch, - LabReportSearchByDepartment, - LabSummeries, - LabSummeriesLevel1, - LabSummeriesLevel2, - LabSummeriesLevel3, - LabReportSearchOwn, - LabReportSearchAll, - LabReceive, - LabEditPatient, - LabInvestigationFee, - LabAddInwardServices, - LabReportSearchByLoggedInstitution, - IncomeReport, - LabReport, - DuesAndAccess, - CheckEnteredData, - LabAdiministrator, - LabReports, - LabItems, - LabItemFeeUpadate, - LabItemFeeDelete, - LabPatientDetailsEdit, - LabLists, - LabSetUp, - LabInwardBilling, - LabInwardSearchServiceBill, - LabCollectingCentreBilling, - LabCCBilling, - LabCCBillingSearch, - LabReportSearch, - LabReporting, - //dont remove - LabSearchBillLoggedInstitution, - PaymentBilling, - PaymentBillSearch, - PaymentBillReprint, - PaymentBillCancel, - PaymentBillRefund, - PaymentBillReactivation, - ReportsSearchCashCardOwn, - ReportsSearchCreditOwn, - ReportsItemOwn, - ReportsSearchCashCardOther, - ReportSearchCreditOther, - ReportsItemOther, - PharmacyOrderCreation, - PharmacyOrderApproval, - PharmacyOrderCancellation, - PharmacySaleWithoutStock, - PharmacySaleReprint, - PharmacySaleCancel, - PharmacySaleReturn, - //Wholesale - PharmacySaleWh, - PharmacySaleReprintWh, - PharmacySaleCancelWh, - PharmacySaleReturnWh, - //end wholesale - PharmacyInwardBilling, - PharmacyInwardBillingCancel, - PharmacyInwardBillingReturn, - PharmacyGoodReceive, - //Wholesale - PharmacyGoodReceiveWh, - //end Wholesale - PharmacyGoodReceiveCancel, - PharmacyGoodReceiveReturn, - PharmacyGoodReceiveEdit, - PharmacyPurchase, - //Wholesale - PharmacyPurchaseWh, - //theater - Theatre, - TheatreAddSurgery, - TheatreBilling, - TheaterTransfer, - TheaterTransferRequest, - TheaterTransferIssue, - TheaterTransferRecieve, - TheaterTransferReport, - TheaterReports, - TheaterSummeries, - TheaterIssue, - TheaterIssuePharmacy, - TheaterIssueStore, - TheaterIssueStoreBhtBilling, - TheaterIssueStoreBhtSearchBill, - TheaterIssueStoreBhtSearchBillItem, - TheaterIssueOpd, - TheaterIssueOpdForCasheir, - TheaterIssueOpdSearchPreBill, - TheaterIssueOpdSearchPreBillForReturnItemOnly, - TheaterIssueOpdSearchPreBillReturn, - TheaterIssueOpdSearchPreBillAddToStock, - ClinicalPatientSummery, - ClinicalPatientDetails, - ClinicalPatientPhoto, - ClinicalVisitDetail, - ClinicalVisitSummery, - ClinicalHistory, - ClinicalAdministration, - ClinicalPatientDelete, - ChannelAdd, - ChannelCancel, - ChannelRefund, - ChannelReturn, - ChannelView, - ChannelDoctorPayments, - ChannelDoctorPaymentCancel, - ChannelViewHistory, - ChannelCreateSessions, - ChannelCreateSpecialSessions, - ChannelManageSessions, - ChannelAdministration, - ChannelAgencyReports, - AdminManagingUsers, - AdminInstitutions, - AdminStaff, - AdminItems, - AdminPrices, - AdminFilterWithoutDepartment, - ChangeProfessionalFee, - ChangeCollectingCentre, - StoreIssue, - StoreIssueInwardBilling, - StoreIssueSearchBill, - StoreIssueBillItems, - StorePurchase, - StorePurchaseOrder, - StorePurchaseOrderApprove, - StorePurchaseOrderApproveSearch, - StorePurchaseGRNRecive, - StorePurchaseGRNReturn, - StorePurchasePurchase, - StoreTransfer, - StoreTransferRequest, - StoreTransferIssue, - StoreTransferRecive, - StoreTransferReport, - StoreAdjustment, - StoreAdjustmentDepartmentStock, - StoreAdjustmentStaffStock, - StoreAdjustmentPurchaseRate, - StoreAdjustmentSaleRate, - StoreDealorPayment, - StoreDealorPaymentDueSearch, - StoreDealorPaymentDueByAge, - StoreDealorPaymentPayment, - StoreDealorPaymentPaymentGRN, - StoreDealorPaymentPaymentGRNSelect, - StoreDealorPaymentGRNDoneSearch, - StoreSearch, - StoreReports, - StoreSummery, - StoreAdministration, - SearchGrand, - CashTransactionCashIn, - CashTransactionCashOut, - CashTransactionListToCashRecieve, - ChannellingChannelBooking, - ChannellingFutureChannelBooking, - ChannellingPastBooking, - ChannellingBookedList, - ChannellingDoctorLeave, - ChannellingDoctorLeaveByDate, - ChannellingDoctorLeaveByServiceSession, - ChannellingChannelSheduling, - ChannellingSpecialChannelSheduling, - ChannellingChannelShedulRemove, - ChannellingChannelShedulName, - ChannellingChannelShedulStartingNo, - ChannellingChannelShedulRoomNo, - ChannellingChannelShedulMaxRowNo, - ChannellingChannelAgentFee, - ChannellingDoctorSessionView, - ChannellingPayment, - ChannellingPaymentPayDoctor, - ChannellingPaymentDueSearch, - ChannellingPaymentDoneSearch, - ChannellingApoinmentNumberCountEdit, - ChannellingEditSerialNo, - ChannellingEditPatientDetails, - ChannellingPrintInPastBooking, - ChannellingEditCreditLimitUserLevel, - ChannellingEditCreditLimitAdminLevel, - ChannellingReprintOriginalBill, - ChannellingPastBookingPatientAttend, - ChannelReports, - ChannelSummery, - ChannelManagement, - ChannelAgencyAgencies, - ChannelAgencyCreditLimitUpdate, - ChannelAgencyCreditLimitUpdateBulk, - ChannelAddChannelBookToAgency, - ChannelManageSpecialities, - ChannelManageConsultants, - ChannelEditingAppoinmentCount, - ChannelAddChannelingConsultantToInstitutions, - ChannelFeeUpdate, - ChannelCrdeitNote, - ChannelCrdeitNoteSearch, - ChannelDebitNote, - ChannelDebitNoteSearch, - ChannelCashCancelRestriction, - ChannelBookingChange, - ChannelBookingBokking, - ChannelBookingReprint, - ChannelBookingCancel, - ChannelBookingRefund, - ChannelBookingSettle, - ChannelBookingSearch, - ChannelBookingViews, - ChannelBookingDocPay, - ChannelBookingRestric, - ChannelCashierTransaction, - ChannelCashierTransactionIncome, - ChannelCashierTransactionIncomeSearch, - ChannelCashierTransactionExpencess, - ChannelCashierTransactionExpencessSearch, - ChannelActiveVat, - MemberShip, - MemberShipAdd, - MemberShipEdit, - MembershipReports, - MembershipDiscountManagement, - MembershipAdministration, - MembershipSchemes, - MemberShipInwardMemberShip, - MemberShipInwardMemberShipSchemesDicounts, - MemberShipInwardMemberShipInwardMemberShipReport, - MemberShipOpdMemberShipDis, - MemberShipOpdMemberShipDisByDepartment, - MemberShipOpdMemberShipDisByCategory, - MemberShipOpdMemberShipDisOpdMemberShipReport, - MemberShipMemberDeActive, - MemberShipMemberReActive, - HrAdmin, - HrReports, - HrReportsLevel1, - HrReportsLevel2, - HrReportsLevel3, - EmployeeHistoryReport, - hrDeleteLateLeave, - HrGenerateSalary, - HrGenerateSalarySpecial, - HrAdvanceSalary, - HrPrintSalary, - HrWorkingTime, - HrRosterTable, - HrUploadAttendance, - HrAnalyseAttendenceByRoster, - HrAnalyseAttendenceByStaff, - HrForms, - HrLeaveForms, - HrAdditionalForms, - HrEditRetiedDate, - HrRemoveResignDate, - Developers, - //Cashier - AllCashierSummery, - //Administration - SearchAll, - ChangePreferece, - SendBulkSMS, - ClinicalAdministrationEditLetter, - ClinicalPatientAdd, - ClinicalPatientEdit, - ClinicalPatientCommentsView, - ClinicalPatientCommentsEdit, - ClinicalPatientNameChange, - ClinicalMembershipAdd, - ClinicalMembershipEdit, - ClinicalPatientPhoneNumberEdit, - //Pharmacy Disbursement - PharmacyDisburesementMenu, - PharmacyDisbursementRequest, - PharmacyDisbursementIssurForRequest, - PharmacyDisbursementDirectIssue, - PharmacyDisbursementRecieve, - PharmacyDisbursementReports, - //Pharmacy Inpatient medication management - InpatientMedicationManagementMenue, - PharmacyDirectIssueToBht, - PharmacyDirectIssueToTheaterCases, - PharmacyBhtIssueRequest, - PharmacySearchInpatientDirectIssuesbyBill, - PharmacySearchInpatientDirectIssuesbyItem, - PharmacySearchInpatientDirectIssueReturnsbyBill, - PharmacysSearchInpatientDirectIssueReturnsbyItem, - //Pharmacy Retail Transactions - PharmacyRetailTransactionMenue, - PharmacyRetailTransaction, - PharmacySale, - PharmacySaleForCashier, - PharmacySaleWithOutStock, - PharmacySearchSaleBill, - PharmacySearchSalePreBill, - PharmacySearchSaleBillItems, - PharmacyReturnItemsOnly, - PharmacyReturnItemsAndPayments, - PharmacySearchReturnBill, - PharmacyAddToStock, - //Pharmacy Wholesale Transaction - PharmacyWholeSaleTransactionMenue, - PharmacyWholeSaleTransaction, - PharmacyWholesaleSale, - PharmacyWholesaleSaleForCashier, - PharmacyWholesaleSearchSaleBill, - PharmacyWholesaleSearchSaleBillToPay, - PharmacyWholesaleSearchSaleBillItems, - PharmacyWholesaleReturnItemsOnly, - PharmacyWholesaleWholeSaleAddToStock, - PharmacyWholeSalePurchase, - PharmacySearchReturnBillItems, - //Pharmacy Disposal - PharmacyDisposalMenue, - PharmacyDisposalIssue, - PharmacyDisposalSearchIssueBill, - PharmacyDisposalSearchIssueBillItems, - PharmacyDisposalSearchIssueReturnBill, - PharmacyDisposalUnitIssueMargin, - //Pharmacy Adjustment - PharmacyAdjustmentMenue, - PharmacyAdjustmentDepartmentStockQTY, - PharmacyAdjustmentDepartmentStockBySingleItemQTY, - PharmacyAdjustmentStaffStockAdjustment, - PharmacyAdjustmentPurchaseRate, - PharmacyAdjustmentSaleRate, - PharmacyAdjustmentWholeSaleRate, - PharmacyAdjustmentExpiryDate, - PharmacyAdjustmentSearchAdjustmentBills, - PharmacyAdjustmentTransferAllStock, - //Pharmacy Dealer Payments - PharmacyDealerPaymentMenue, - PharmacyDealerDueSearch, - PharmacyDealerDueByAge, - PharmacyPayment, - PharmacyGRNPaymentApprove, - PharmacyGRNPaymentDoneSearch, - PharmacyCreditDueAndAccess, - //Whalesale - PharmacyWholesaleMenue, - PharmacyPurchaseReprint, - PharmacyPurchaseCancellation, - PharmacyPurchaseReturn, - PharmacyStockAdjustment, - PharmacyStockAdjustmentSingleItem, - PharmacyReAddToStock, - PharmacyStockIssue, - PharmacyDealorPayment, - PharmacySearch, - PharmacyReports, - PharmacyTransfer, - PharmacySummery, - PharmacyAdministration, - PharmacySetReorderLevel, - PharmacyReturnWithoutTraising, - PharmacyBHTIssueAccept, - //Pharmacy Procurement - PharmacyProcurementMenu, - CreatePurchaseOrder, - AutoOrderPModel, - AutoOrderQModal, - DirectPurchase, - PurchaseOrdersApprovel, - TransferReciveApproval, - GoodsRecipt, - ReturnReceviedGoods, - ReturnWithoutRecipt, - // - PharmacyItemSearch, - PharmacyGenarateReports, - PharmacySummaryViews, - //Optician - Optician, - OpticianPatientManagement, - OpticianAppointmentManagement, - OpticianEmr, - OpticianStockManagement, - OpticianProductCatalog, - OpticianRepairManagement, + // Main Menu Privileges + TheaterIssueBHT("Theater Issue BHT"), + Opd("OPD"), + Inward("Inward"), + Lab("Lab"), + Pharmacy("Pharmacy"), + Payment("Payment"), + Hr("HR"), + Reports("Reports"), + User("User"), + Admin("Admin"), + Channelling("Channelling"), + Clinical("Clinical"), + Store("Store"), + Search("Search"), + CashTransaction("Cash Transaction"), + ChangeCreditLimitInCC("Change Credit Limit in Collecting Centre"), + + // Submenu Privileges + OpdBilling("OPD Billing"), + OpdCollectingCentreBillingMenu("OPD Collecting Centre Billing Menu"), + OpdCollectingCentreBilling("OPD Collecting Centre Billing"), + OpdCollectingCentreBillSearch("OPD Collecting Centre Bill Search"), + OpdPreBilling("OPD Pre Billing"), + OpdBillSearch("OPD Bill Search"), + OpdBillItemSearch("OPD Bill Item Search"), + OpdReprint("OPD Reprint"), + OpdCancel("OPD Cancel"), + OpdReturn("OPD Return"), + OpdReactivate("OPD Reactivate"), + OpdBillSearchEdit("OPD Bill Search Edit"), + OpdLabReportSearch("OPD Lab Report Search"), + OpdReprintOriginalBill("OPD Reprint Original Bill"), + OpdAddNewRefferalDoctor("OPD Add New Referral Doctor"), + OpdAddNewCollectingCentre("OPD Add New Collecting Centre"), + AddCreditLimitInRegistration("Add Credit Limit in Registration"), + InwardAdmissions("Inward Admissions"), + InwardAdmissionsAdmission("Inward Admissions Admission"), + InwardAdmissionsEditAdmission("Inward Admissions Edit Admission"), + InwardAdmissionsInwardAppoinment("Inward Admissions Inward Appointment"), + InwardRoom("Inward Room"), + InwardRoomRoomOccupency("Inward Room Occupancy"), + InwardRoomRoomChange("Inward Room Change"), + InwardRoomGurdianRoomChange("Inward Guardian Room Change"), + InwardRoomDischarge("Inward Room Discharge"), + InwardServicesAndItems("Inward Services and Items"), + InwardServicesAndItemsAddServices("Inward Add Services"), + InwardServicesAndItemsAddOutSideCharges("Inward Add Outside Charges"), + InwardServicesAndItemsAddProfessionalFee("Inward Add Professional Fee"), + InwardServicesAndItemsAddTimedServices("Inward Add Timed Services"), + InwardBilling("Inward Billing"), + InwardBillingInterimBill("Inward Interim Bill"), + InwardBillingInterimBillSearch("Inward Interim Bill Search"), + InwardSearch("Inward Search"), + InwardSearchServiceBill("Inward Search Service Bill"), + InwardSearchProfessionalBill("Inward Search Professional Bill"), + InwardSearchFinalBill("Inward Search Final Bill"), + InwardReport("Inward Report"), + InwardFinalBillReportEdit("Inward Final Bill Report Edit"), + InwardAdministration("Inward Administration"), + InwardAdditionalPrivilages("Inward Additional Privileges"), + InwardBillSearch("Inward Bill Search"), + InwardBillItemSearch("Inward Bill Item Search"), + InwardBillReprint("Inward Bill Reprint"), + InwardCancel("Inward Cancel"), + InwardReturn("Inward Return"), + InwardReactivate("Inward Reactivate"), + InwardCheck("Inward Check"), + InwardUnCheck("Inward Uncheck"), + InwardFinalBillCancel("Inward Final Bill Cancel"), + InwardOutSideMarkAsUnPaid("Inward Outside Mark As Unpaid"), + ShowInwardFee("Show Inward Fee"), + InwardPharmacyMenu("Inward Pharmacy Menu"), + InwardPharmacyIssueRequest("Inward Pharmacy Issue Request"), + InwardPharmacyIssueRequestSearch("Inward Pharmacy Issue Request Search"), + InwardBillSettleWithoutCheck("Inward Bill Settle Without Check"), + + LabBilling("Lab Billing"), + LabBillCancelSpecial("Lab Bill Cancel Special"), + LabBillRefundSpecial("Lab Bill Refund Special"), + LabCasheirBillSearch("Lab Cashier Bill Search"), + LabCashier("Lab Cashier"), + LabBillSearchCashier("Lab Bill Search Cashier"), + LabBillSearch("Lab Bill Search"), + LabBillItemSearch("Lab Bill Item Search"), + LabBillCancelling("Lab Bill Cancelling"), + CollectingCentreCancelling("Collecting Centre Cancelling"), + LabBillReturning("Lab Bill Returning"), + LabBillReprint("Lab Bill Reprint"), + LabBillRefunding("Lab Bill Refunding"), + LabBillReactivating("Lab Bill Reactivating"), + LabSampleCollecting("Lab Sample Collecting"), + LabSampleReceiving("Lab Sample Receiving"), + LabReportFormatEditing("Lab Report Format Editing"), + LabDataentry("Lab Data Entry"), + LabAutherizing("Lab Authorizing"), + LabDeAutherizing("Lab Deauthorizing"), + LabRevertSample("Lab Revert Sample"), + LabPrinting("Lab Printing"), + LabReprinting("Lab Reprinting"), + LabReportEdit("Lab Report Edit"), + LabReportPrint("Lab Report Print"), + AdminReportSearch("Admin Report Search"), + LabReportSearchByDepartment("Lab Report Search by Department"), + LabSummeries("Lab Summaries"), + LabSummeriesLevel1("Lab Summaries Level 1"), + LabSummeriesLevel2("Lab Summaries Level 2"), + LabSummeriesLevel3("Lab Summaries Level 3"), + LabReportSearchOwn("Lab Report Search Own"), + LabReportSearchAll("Lab Report Search All"), + LabReceive("Lab Receive"), + LabEditPatient("Lab Edit Patient"), + LabInvestigationFee("Lab Investigation Fee"), + LabAddInwardServices("Lab Add Inward Services"), + LabReportSearchByLoggedInstitution("Lab Report Search by Logged Institution"), + IncomeReport("Income Report"), + LabReport("Lab Report"), + DuesAndAccess("Dues and Access"), + CheckEnteredData("Check Entered Data"), + LabAdiministrator("Lab Administrator"), + LabReports("Lab Reports"), + LabItems("Lab Items"), + LabItemFeeUpadate("Lab Item Fee Update"), + LabItemFeeDelete("Lab Item Fee Delete"), + LabPatientDetailsEdit("Lab Patient Details Edit"), + LabLists("Lab Lists"), + LabSetUp("Lab Setup"), + LabInwardBilling("Lab Inward Billing"), + LabInwardSearchServiceBill("Lab Inward Search Service Bill"), + LabCollectingCentreBilling("Lab Collecting Centre Billing"), + LabCCBilling("Lab CC Billing"), + LabCCBillingSearch("Lab CC Billing Search"), + LabReportSearch("Lab Report Search"), + LabReporting("Lab Reporting"), + // Don't remove + LabSearchBillLoggedInstitution("Lab Search Bill Logged Institution"), + + PaymentBilling("Payment Billing"), + PaymentBillSearch("Payment Bill Search"), + PaymentBillReprint("Payment Bill Reprint"), + PaymentBillCancel("Payment Bill Cancel"), + PaymentBillRefund("Payment Bill Refund"), + PaymentBillReactivation("Payment Bill Reactivation"), + ReportsSearchCashCardOwn("Reports Search Cash/Card Own"), + ReportsSearchCreditOwn("Reports Search Credit Own"), + ReportsItemOwn("Reports Item Own"), + ReportsSearchCashCardOther("Reports Search Cash/Card Other"), + ReportSearchCreditOther("Report Search Credit Other"), + ReportsItemOther("Reports Item Other"), + + PharmacyOrderCreation("Pharmacy Order Creation"), + PharmacyOrderApproval("Pharmacy Order Approval"), + PharmacyOrderCancellation("Pharmacy Order Cancellation"), + PharmacySaleWithoutStock("Pharmacy Sale Without Stock"), + PharmacySaleReprint("Pharmacy Sale Reprint"), + PharmacySaleCancel("Pharmacy Sale Cancel"), + PharmacySaleReturn("Pharmacy Sale Return"), + + // Wholesale + PharmacySaleWh("Pharmacy Sale Wholesale"), + PharmacySaleReprintWh("Pharmacy Sale Reprint Wholesale"), + PharmacySaleCancelWh("Pharmacy Sale Cancel Wholesale"), + PharmacySaleReturnWh("Pharmacy Sale Return Wholesale"), + + // End wholesale + PharmacyInwardBilling("Pharmacy Inward Billing"), + PharmacyInwardBillingCancel("Pharmacy Inward Billing Cancel"), + PharmacyInwardBillingReturn("Pharmacy Inward Billing Return"), + PharmacyGoodReceive("Pharmacy Good Receive"), + + // Wholesale + PharmacyGoodReceiveWh("Pharmacy Good Receive Wholesale"), + // End Wholesale + PharmacyGoodReceiveCancel("Pharmacy Good Receive Cancel"), + PharmacyGoodReceiveReturn("Pharmacy Good Receive Return"), + PharmacyGoodReceiveEdit("Pharmacy Good Receive Edit"), + PharmacyPurchase("Pharmacy Purchase"), + + // Wholesale + PharmacyPurchaseWh("Pharmacy Purchase Wholesale"), + // Theater + Theatre("Theater"), + TheatreAddSurgery("Theater Add Surgery"), + TheatreBilling("Theater Billing"), + TheaterTransfer("Theater Transfer"), + TheaterTransferRequest("Theater Transfer Request"), + TheaterTransferIssue("Theater Transfer Issue"), + TheaterTransferRecieve("Theater Transfer Receive"), + TheaterTransferReport("Theater Transfer Report"), + TheaterReports("Theater Reports"), + TheaterSummeries("Theater Summaries"), + TheaterIssue("Theater Issue"), + TheaterIssuePharmacy("Theater Issue Pharmacy"), + TheaterIssueStore("Theater Issue Store"), + TheaterIssueStoreBhtBilling("Theater Issue Store BHT Billing"), + TheaterIssueStoreBhtSearchBill("Theater Issue Store BHT Search Bill"), + TheaterIssueStoreBhtSearchBillItem("Theater Issue Store BHT Search Bill Item"), + TheaterIssueOpd("Theater Issue OPD"), + TheaterIssueOpdForCasheir("Theater Issue OPD for Cashier"), + TheaterIssueOpdSearchPreBill("Theater Issue OPD Search Pre Bill"), + TheaterIssueOpdSearchPreBillForReturnItemOnly("Theater Issue OPD Search Pre Bill for Return Item Only"), + TheaterIssueOpdSearchPreBillReturn("Theater Issue OPD Search Pre Bill Return"), + TheaterIssueOpdSearchPreBillAddToStock("Theater Issue OPD Search Pre Bill Add to Stock"), + + ClinicalPatientSummery("Clinical Patient Summary"), + ClinicalPatientDetails("Clinical Patient Details"), + ClinicalPatientPhoto("Clinical Patient Photo"), + ClinicalVisitDetail("Clinical Visit Detail"), + ClinicalVisitSummery("Clinical Visit Summary"), + ClinicalHistory("Clinical History"), + ClinicalAdministration("Clinical Administration"), + ClinicalPatientDelete("Clinical Patient Delete"), + + ChannelAdd("Channel Add"), + ChannelCancel("Channel Cancel"), + ChannelRefund("Channel Refund"), + ChannelReturn("Channel Return"), + ChannelView("Channel View"), + ChannelDoctorPayments("Channel Doctor Payments"), + ChannelDoctorPaymentCancel("Channel Doctor Payment Cancel"), + ChannelViewHistory("Channel View History"), + ChannelCreateSessions("Channel Create Sessions"), + ChannelCreateSpecialSessions("Channel Create Special Sessions"), + ChannelManageSessions("Channel Manage Sessions"), + ChannelAdministration("Channel Administration"), + ChannelAgencyReports("Channel Agency Reports"), + + AdminManagingUsers("Admin Managing Users"), + AdminInstitutions("Admin Institutions"), + AdminStaff("Admin Staff"), + AdminItems("Admin Items"), + AdminPrices("Admin Prices"), + AdminFilterWithoutDepartment("Admin Filter Without Department"), + ChangeProfessionalFee("Change Professional Fee"), + ChangeCollectingCentre("Change Collecting Centre"), + + StoreIssue("Store Issue"), + StoreIssueInwardBilling("Store Issue Inward Billing"), + StoreIssueSearchBill("Store Issue Search Bill"), + StoreIssueBillItems("Store Issue Bill Items"), + StorePurchase("Store Purchase"), + StorePurchaseOrder("Store Purchase Order"), + StorePurchaseOrderApprove("Store Purchase Order Approve"), + StorePurchaseOrderApproveSearch("Store Purchase Order Approve Search"), + StorePurchaseGRNRecive("Store Purchase GRN Receive"), + StorePurchaseGRNReturn("Store Purchase GRN Return"), + StorePurchasePurchase("Store Purchase"), + StoreTransfer("Store Transfer"), + StoreTransferRequest("Store Transfer Request"), + StoreTransferIssue("Store Transfer Issue"), + StoreTransferRecive("Store Transfer Receive"), + StoreTransferReport("Store Transfer Report"), + StoreAdjustment("Store Adjustment"), + StoreAdjustmentDepartmentStock("Store Adjustment Department Stock"), + StoreAdjustmentStaffStock("Store Adjustment Staff Stock"), + StoreAdjustmentPurchaseRate("Store Adjustment Purchase Rate"), + StoreAdjustmentSaleRate("Store Adjustment Sale Rate"), + + StoreDealorPayment("Store Dealer Payment"), + StoreDealorPaymentDueSearch("Store Dealer Payment Due Search"), + StoreDealorPaymentDueByAge("Store Dealer Payment Due by Age"), + StoreDealorPaymentPayment("Store Dealer Payment Payment"), + StoreDealorPaymentPaymentGRN("Store Dealer Payment Payment GRN"), + StoreDealorPaymentPaymentGRNSelect("Store Dealer Payment Payment GRN Select"), + StoreDealorPaymentGRNDoneSearch("Store Dealer Payment GRN Done Search"), + + StoreSearch("Store Search"), + StoreReports("Store Reports"), + StoreSummery("Store Summary"), + StoreAdministration("Store Administration"), + + SearchGrand("Search Grand"), + + CashTransactionCashIn("Cash Transaction Cash In"), + CashTransactionCashOut("Cash Transaction Cash Out"), + CashTransactionListToCashRecieve("Cash Transaction List to Cash Receive"), + + ChannellingChannelBooking("Channelling Channel Booking"), + ChannellingFutureChannelBooking("Channelling Future Channel Booking"), + ChannellingPastBooking("Channelling Past Booking"), + ChannellingBookedList("Channelling Booked List"), + ChannellingDoctorLeave("Channelling Doctor Leave"), + ChannellingDoctorLeaveByDate("Channelling Doctor Leave by Date"), + ChannellingDoctorLeaveByServiceSession("Channelling Doctor Leave by Service Session"), + ChannellingChannelSheduling("Channelling Channel Scheduling"), + ChannellingSpecialChannelSheduling("Channelling Special Channel Scheduling"), + ChannellingChannelShedulRemove("Channelling Channel Schedule Remove"), + ChannellingChannelShedulName("Channelling Channel Schedule Name"), + ChannellingChannelShedulStartingNo("Channelling Channel Schedule Starting No"), + ChannellingChannelShedulRoomNo("Channelling Channel Schedule Room No"), + ChannellingChannelShedulMaxRowNo("Channelling Channel Schedule Max Row No"), + ChannellingChannelAgentFee("Channelling Channel Agent Fee"), + ChannellingDoctorSessionView("Channelling Doctor Session View"), + + ChannellingPayment("Channelling Payment"), + ChannellingPaymentPayDoctor("Channelling Payment Pay Doctor"), + ChannellingPaymentDueSearch("Channelling Payment Due Search"), + ChannellingPaymentDoneSearch("Channelling Payment Done Search"), + + ChannellingApoinmentNumberCountEdit("Channelling Appointment Number Count Edit"), + ChannellingEditSerialNo("Channelling Edit Serial No"), + ChannellingEditPatientDetails("Channelling Edit Patient Details"), + ChannellingPrintInPastBooking("Channelling Print in Past Booking"), + ChannellingEditCreditLimitUserLevel("Channelling Edit Credit Limit User Level"), + ChannellingEditCreditLimitAdminLevel("Channelling Edit Credit Limit Admin Level"), + + ChannellingReprintOriginalBill("Channelling Reprint Original Bill"), + ChannellingPastBookingPatientAttend("Channelling Past Booking Patient Attend"), + + ChannelReports("Channel Reports"), + ChannelSummery("Channel Summary"), + ChannelManagement("Channel Management"), + ChannelAgencyAgencies("Channel Agency Agencies"), + ChannelAgencyCreditLimitUpdate("Channel Agency Credit Limit Update"), + ChannelAgencyCreditLimitUpdateBulk("Channel Agency Credit Limit Update Bulk"), + ChannelAddChannelBookToAgency("Channel Add Channel Book to Agency"), + ChannelManageSpecialities("Channel Manage Specialities"), + ChannelManageConsultants("Channel Manage Consultants"), + ChannelEditingAppoinmentCount("Channel Editing Appointment Count"), + ChannelAddChannelingConsultantToInstitutions("Channel Add Channelling Consultant to Institutions"), + ChannelFeeUpdate("Channel Fee Update"), + ChannelCrdeitNote("Channel Credit Note"), + ChannelCrdeitNoteSearch("Channel Credit Note Search"), + ChannelDebitNote("Channel Debit Note"), + ChannelDebitNoteSearch("Channel Debit Note Search"), + ChannelCashCancelRestriction("Channel Cash Cancel Restriction"), + + ChannelBookingChange("Channel Booking Change"), + ChannelBookingBokking("Channel Booking Booking"), + ChannelBookingReprint("Channel Booking Reprint"), + ChannelBookingCancel("Channel Booking Cancel"), + ChannelBookingRefund("Channel Booking Refund"), + ChannelBookingSettle("Channel Booking Settle"), + ChannelBookingSearch("Channel Booking Search"), + ChannelBookingViews("Channel Booking Views"), + ChannelBookingDocPay("Channel Booking Doc Pay"), + ChannelBookingRestric("Channel Booking Restrict"), + ChannelCashierTransaction("Channel Cashier Transaction"), + ChannelCashierTransactionIncome("Channel Cashier Transaction Income"), + ChannelCashierTransactionIncomeSearch("Channel Cashier Transaction Income Search"), + ChannelCashierTransactionExpencess("Channel Cashier Transaction Expenses"), + ChannelCashierTransactionExpencessSearch("Channel Cashier Transaction Expenses Search"), + + ChannelActiveVat("Channel Active VAT"), + + MemberShip("Membership"), + MemberShipAdd("Membership Add"), + MemberShipEdit("Membership Edit"), + MembershipReports("Membership Reports"), + MembershipDiscountManagement("Membership Discount Management"), + MembershipAdministration("Membership Administration"), + MembershipSchemes("Membership Schemes"), + MemberShipInwardMemberShip("Inward Membership"), + MemberShipInwardMemberShipSchemesDicounts("Inward Membership Schemes Discounts"), + MemberShipInwardMemberShipInwardMemberShipReport("Inward Membership Report"), + MemberShipOpdMemberShipDis("OPD Membership Discount"), + MemberShipOpdMemberShipDisByDepartment("OPD Membership Discount by Department"), + MemberShipOpdMemberShipDisByCategory("OPD Membership Discount by Category"), + MemberShipOpdMemberShipDisOpdMemberShipReport("OPD Membership Report"), + MemberShipMemberDeActive("Membership Deactivate"), + MemberShipMemberReActive("Membership Reactivate"), + + HrAdmin("HR Admin"), + HrReports("HR Reports"), + HrReportsLevel1("HR Reports Level 1"), + HrReportsLevel2("HR Reports Level 2"), + HrReportsLevel3("HR Reports Level 3"), + EmployeeHistoryReport("Employee History Report"), + hrDeleteLateLeave("HR Delete Late Leave"), + HrGenerateSalary("HR Generate Salary"), + HrGenerateSalarySpecial("HR Generate Salary Special"), + HrAdvanceSalary("HR Advance Salary"), + HrPrintSalary("HR Print Salary"), + HrWorkingTime("HR Working Time"), + HrRosterTable("HR Roster Table"), + HrUploadAttendance("HR Upload Attendance"), + HrAnalyseAttendenceByRoster("HR Analyse Attendance by Roster"), + HrAnalyseAttendenceByStaff("HR Analyse Attendance by Staff"), + HrForms("HR Forms"), + HrLeaveForms("HR Leave Forms"), + HrAdditionalForms("HR Additional Forms"), + HrEditRetiedDate("HR Edit Retired Date"), + HrRemoveResignDate("HR Remove Resign Date"), + Developers("Developers"), + + // Cashier + AllCashierSummery("All Cashier Summary"), + + // Administration + SearchAll("Search All"), + ChangePreferece("Change Preference"), + SendBulkSMS("Send Bulk SMS"), + ClinicalAdministrationEditLetter("Clinical Administration Edit Letter"), + ClinicalPatientAdd("Clinical Patient Add"), + ClinicalPatientEdit("Clinical Patient Edit"), + ClinicalPatientCommentsView("Clinical Patient Comments View"), + ClinicalPatientCommentsEdit("Clinical Patient Comments Edit"), + ClinicalPatientNameChange("Clinical Patient Name Change"), + ClinicalMembershipAdd("Clinical Membership Add"), + ClinicalMembershipEdit("Clinical Membership Edit"), + ClinicalPatientPhoneNumberEdit("Clinical Patient Phone Number Edit"), + + // Pharmacy Disbursement + PharmacyDisburesementMenu("Pharmacy Disbursement Menu"), + PharmacyDisbursementRequest("Pharmacy Disbursement Request"), + PharmacyDisbursementIssurForRequest("Pharmacy Disbursement Issue for Request"), + PharmacyDisbursementDirectIssue("Pharmacy Disbursement Direct Issue"), + PharmacyDisbursementRecieve("Pharmacy Disbursement Receive"), + PharmacyDisbursementReports("Pharmacy Disbursement Reports"), + + // Pharmacy Inpatient medication management + InpatientMedicationManagementMenue("Inpatient Medication Management Menu"), + PharmacyDirectIssueToBht("Pharmacy Direct Issue to BHT"), + PharmacyDirectIssueToTheaterCases("Pharmacy Direct Issue to Theater Cases"), + PharmacyBhtIssueRequest("Pharmacy BHT Issue Request"), + PharmacySearchInpatientDirectIssuesbyBill("Pharmacy Search Inpatient Direct Issues by Bill"), + PharmacySearchInpatientDirectIssuesbyItem("Pharmacy Search Inpatient Direct Issues by Item"), + PharmacySearchInpatientDirectIssueReturnsbyBill("Pharmacy Search Inpatient Direct Issue Returns by Bill"), + PharmacysSearchInpatientDirectIssueReturnsbyItem("Pharmacy Search Inpatient Direct Issue Returns by Item"), + + // Pharmacy Retail Transactions + PharmacyRetailTransactionMenue("Pharmacy Retail Transaction Menu"), + PharmacyRetailTransaction("Pharmacy Retail Transaction"), + PharmacySale("Pharmacy Sale"), + PharmacySaleForCashier("Pharmacy Sale for Cashier"), + PharmacySaleWithOutStock("Pharmacy Sale without Stock"), + PharmacySearchSaleBill("Pharmacy Search Sale Bill"), + PharmacySearchSalePreBill("Pharmacy Search Sale Pre-Bill"), + PharmacySearchSaleBillItems("Pharmacy Search Sale Bill Items"), + PharmacyReturnItemsOnly("Pharmacy Return Items Only"), + PharmacyReturnItemsAndPayments("Pharmacy Return Items and Payments"), + PharmacySearchReturnBill("Pharmacy Search Return Bill"), + PharmacyAddToStock("Pharmacy Add to Stock"), + + // Pharmacy Wholesale Transaction + PharmacyWholeSaleTransactionMenue("Pharmacy Wholesale Transaction Menu"), + PharmacyWholeSaleTransaction("Pharmacy Wholesale Transaction"), + PharmacyWholesaleSale("Pharmacy Wholesale Sale"), + PharmacyWholesaleSaleForCashier("Pharmacy Wholesale Sale for Cashier"), + PharmacyWholesaleSearchSaleBill("Pharmacy Wholesale Search Sale Bill"), + PharmacyWholesaleSearchSaleBillToPay("Pharmacy Wholesale Search Sale Bill to Pay"), + PharmacyWholesaleSearchSaleBillItems("Pharmacy Wholesale Search Sale Bill Items"), + PharmacyWholesaleReturnItemsOnly("Pharmacy Wholesale Return Items Only"), + PharmacyWholesaleWholeSaleAddToStock("Pharmacy Wholesale Add to Stock"), + PharmacyWholeSalePurchase("Pharmacy Wholesale Purchase"), + PharmacySearchReturnBillItems("Pharmacy Search Return Bill Items"), + + // Pharmacy Disposal + PharmacyDisposalMenue("Pharmacy Disposal Menu"), + PharmacyDisposalIssue("Pharmacy Disposal Issue"), + PharmacyDisposalSearchIssueBill("Pharmacy Disposal Search Issue Bill"), + PharmacyDisposalSearchIssueBillItems("Pharmacy Disposal Search Issue Bill Items"), + PharmacyDisposalSearchIssueReturnBill("Pharmacy Disposal Search Issue Return Bill"), + PharmacyDisposalUnitIssueMargin("Pharmacy Disposal Unit Issue Margin"), + + // Pharmacy Adjustment + PharmacyAdjustmentMenue("Pharmacy Adjustment Menu"), + PharmacyAdjustmentDepartmentStockQTY("Pharmacy Adjustment Department Stock Quantity"), + PharmacyAdjustmentDepartmentStockBySingleItemQTY("Pharmacy Adjustment Department Stock by Single Item Quantity"), + PharmacyAdjustmentStaffStockAdjustment("Pharmacy Adjustment Staff Stock Adjustment"), + PharmacyAdjustmentPurchaseRate("Pharmacy Adjustment Purchase Rate"), + PharmacyAdjustmentSaleRate("Pharmacy Adjustment Sale Rate"), + PharmacyAdjustmentWholeSaleRate("Pharmacy Adjustment Wholesale Rate"), + PharmacyAdjustmentExpiryDate("Pharmacy Adjustment Expiry Date"), + PharmacyAdjustmentSearchAdjustmentBills("Pharmacy Adjustment Search Adjustment Bills"), + PharmacyAdjustmentTransferAllStock("Pharmacy Adjustment Transfer All Stock"), + + // Pharmacy Dealer Payments + PharmacyDealerPaymentMenue("Pharmacy Dealer Payment Menu"), + PharmacyDealerDueSearch("Pharmacy Dealer Due Search"), + PharmacyDealerDueByAge("Pharmacy Dealer Due by Age"), + PharmacyPayment("Pharmacy Payment"), + PharmacyGRNPaymentApprove("Pharmacy GRN Payment Approve"), + PharmacyGRNPaymentDoneSearch("Pharmacy GRN Payment Done Search"), + PharmacyCreditDueAndAccess("Pharmacy Credit Due and Access"), + + // Whalesale + PharmacyWholesaleMenue("Pharmacy Wholesale Menu"), + PharmacyPurchaseReprint("Pharmacy Purchase Reprint"), + PharmacyPurchaseCancellation("Pharmacy Purchase Cancellation"), + PharmacyPurchaseReturn("Pharmacy Purchase Return"), + PharmacyStockAdjustment("Pharmacy Stock Adjustment"), + PharmacyStockAdjustmentSingleItem("Pharmacy Stock Adjustment Single Item"), + PharmacyReAddToStock("Pharmacy Re-Add to Stock"), + PharmacyStockIssue("Pharmacy Stock Issue"), + PharmacyDealorPayment("Pharmacy Dealer Payment"), + PharmacySearch("Pharmacy Search"), + PharmacyReports("Pharmacy Reports"), + PharmacyTransfer("Pharmacy Transfer"), + PharmacySummery("Pharmacy Summary"), + PharmacyAdministration("Pharmacy Administration"), + PharmacySetReorderLevel("Pharmacy Set Reorder Level"), + PharmacyReturnWithoutTraising("Pharmacy Return without Traising"), + PharmacyBHTIssueAccept("Pharmacy BHT Issue Accept"), + + // Pharmacy Procurement + PharmacyProcurementMenu("Pharmacy Procurement Menu"), + CreatePurchaseOrder("Create Purchase Order"), + AutoOrderPModel("Auto Order P Model"), + AutoOrderQModal("Auto Order Q Model"), + DirectPurchase("Direct Purchase"), + PurchaseOrdersApprovel("Purchase Orders Approval"), + TransferReciveApproval("Transfer Receive Approval"), + GoodsRecipt("Goods Receipt"), + ReturnReceviedGoods("Return Received Goods"), + ReturnWithoutRecipt("Return without Receipt"), + + PharmacyItemSearch("Pharmacy Item Search"), + PharmacyGenarateReports("Pharmacy Generate Reports"), + PharmacySummaryViews("Pharmacy Summary Views"), + + // Optician + Optician("Optician"), + OpticianPatientManagement("Optician Patient Management"), + OpticianAppointmentManagement("Optician Appointment Management"), + OpticianEmr("Optician EMR"), + OpticianStockManagement("Optician Stock Management"), + OpticianProductCatalog("Optician Product Catalog"), + OpticianRepairManagement("Optician Repair Management"), + @Deprecated - Ophthalmology, + Ophthalmology("Ophthalmology"), @Deprecated - OphthalmologyPatientManagement, + OphthalmologyPatientManagement("Ophthalmology Patient Management"), @Deprecated - OphthalmologyAppointmentManagement, + OphthalmologyAppointmentManagement("Ophthalmology Appointment Management"), @Deprecated - OphthalmologyEmr, + OphthalmologyEmr("Ophthalmology EMR"), @Deprecated - OphthalmologyStockManagement, + OphthalmologyStockManagement("Ophthalmology Stock Management"), @Deprecated - OphthalmologyProductCatalog, + OphthalmologyProductCatalog("Ophthalmology Product Catalog"), @Deprecated - OphthalmologyRepairManagement, - ; + OphthalmologyRepairManagement("Ophthalmology Repair Management"), - public String getLabel() { - switch (this) { - case Opd: - return "Online Settlement"; - case OpdCancel: - return "OPD Bill Cancellation"; - case OpdReturn: - return "OPD Bill Return"; - default: - return this.toString(); + // New privileges for couriers + CourierCollectSamples("Courier Collect Samples"), + CourierHandoverSamplesToLab("Courier Handover Samples to Lab"), + CourierViewReports("Courier View Reports"), + CourierPrintReports("Courier Print Reports"), + CourierViewStatistics("Courier View Statistics"), + CourierViewBillReports("Courier View Bill Reports"), + CourierViewPaymentReports("Courier View Payment Reports"); - } + private final String label; + + Privileges(String label) { + this.label = label; + } + + public String getLabel() { + return label; } public boolean isFromDatabase() { @@ -540,7 +579,6 @@ public boolean isFromDatabase() { case MemberShip: case Search: case User: - return false; default: return true; @@ -655,7 +693,7 @@ public String getCategory() { case PharmacyReturnWithoutTraising: case PharmacyStockAdjustmentSingleItem: - //Inpatient medication management + // Inpatient medication management case InpatientMedicationManagementMenue: case PharmacyDirectIssueToBht: case PharmacyDirectIssueToTheaterCases: @@ -664,7 +702,7 @@ public String getCategory() { case PharmacySearchInpatientDirectIssuesbyItem: case PharmacySearchInpatientDirectIssueReturnsbyBill: case PharmacysSearchInpatientDirectIssueReturnsbyItem: - //Procurement + // Procurement case PharmacyProcurementMenu: case CreatePurchaseOrder: case AutoOrderPModel: @@ -674,7 +712,7 @@ public String getCategory() { case GoodsRecipt: case ReturnReceviedGoods: case ReturnWithoutRecipt: - //Disburesement + // Disbursement case PharmacyDisburesementMenu: case PharmacyDisbursementRequest: case PharmacyDisbursementIssurForRequest: @@ -682,7 +720,7 @@ public String getCategory() { case PharmacyDisbursementRecieve: case PharmacyDisbursementReports: - //Retail Transactions + // Retail Transactions case PharmacyRetailTransaction: case PharmacySale: case PharmacySaleForCashier: @@ -695,7 +733,7 @@ public String getCategory() { case PharmacySearchReturnBill: case PharmacyAddToStock: - //Wholesale Transaction + // Wholesale Transaction case PharmacyWholeSaleTransaction: case PharmacyWholesaleSale: case PharmacyWholesaleSaleForCashier: @@ -706,14 +744,14 @@ public String getCategory() { case PharmacyWholesaleWholeSaleAddToStock: case PharmacyWholeSalePurchase: - //Disposal + // Disposal case PharmacyDisposalIssue: case PharmacyDisposalSearchIssueBill: case PharmacyDisposalSearchIssueBillItems: case PharmacyDisposalSearchIssueReturnBill: case PharmacyDisposalUnitIssueMargin: - //Pharmacy Adjustment + // Pharmacy Adjustment case PharmacyAdjustmentDepartmentStockQTY: case PharmacyAdjustmentDepartmentStockBySingleItemQTY: case PharmacyAdjustmentStaffStockAdjustment: @@ -724,7 +762,7 @@ public String getCategory() { case PharmacyAdjustmentSearchAdjustmentBills: case PharmacyAdjustmentTransferAllStock: - //Pharmacy Dealer Payments + // Pharmacy Dealer Payments case PharmacyDealerDueSearch: case PharmacyDealerDueByAge: case PharmacyPayment: diff --git a/src/main/java/com/divudi/data/channel/PatientPortalController.java b/src/main/java/com/divudi/data/channel/PatientPortalController.java index b15b8f86be..244a553406 100644 --- a/src/main/java/com/divudi/data/channel/PatientPortalController.java +++ b/src/main/java/com/divudi/data/channel/PatientPortalController.java @@ -14,13 +14,11 @@ import com.divudi.data.BillType; import com.divudi.data.MessageType; import com.divudi.data.PaymentMethod; -import com.divudi.data.SmsSentResponse; import com.divudi.ejb.ChannelBean; import com.divudi.ejb.SmsManagerEjb; import com.divudi.entity.Bill; import com.divudi.entity.BillSession; import com.divudi.entity.Consultant; -import com.divudi.entity.Doctor; import com.divudi.entity.Patient; import com.divudi.entity.Payment; import com.divudi.entity.PaymentGatewayTransaction; diff --git a/src/main/java/com/divudi/data/hr/ReportKeyWord.java b/src/main/java/com/divudi/data/hr/ReportKeyWord.java index 35bfa2d353..4b4d1d4bd2 100644 --- a/src/main/java/com/divudi/data/hr/ReportKeyWord.java +++ b/src/main/java/com/divudi/data/hr/ReportKeyWord.java @@ -31,7 +31,6 @@ import com.divudi.entity.membership.MembershipScheme; import com.divudi.java.CommonFunctions; import java.util.Date; -import javax.inject.Inject; import javax.persistence.Transient; /** diff --git a/src/main/java/com/divudi/ejb/BillNumberGenerator.java b/src/main/java/com/divudi/ejb/BillNumberGenerator.java index 797ea48762..27d525c1ca 100644 --- a/src/main/java/com/divudi/ejb/BillNumberGenerator.java +++ b/src/main/java/com/divudi/ejb/BillNumberGenerator.java @@ -27,7 +27,6 @@ import com.divudi.facade.InstitutionFacade; import com.divudi.facade.ItemFacade; import com.divudi.facade.PatientFacade; -import com.divudi.java.CommonFunctions; import java.text.DecimalFormat; import java.util.Arrays; import java.util.Calendar; diff --git a/src/main/java/com/divudi/ejb/ChannelBean.java b/src/main/java/com/divudi/ejb/ChannelBean.java index 4d09e27fa9..b568ed71ed 100644 --- a/src/main/java/com/divudi/ejb/ChannelBean.java +++ b/src/main/java/com/divudi/ejb/ChannelBean.java @@ -7,7 +7,6 @@ import com.divudi.bean.channel.BookingController; import com.divudi.bean.channel.ChannelBillController; import com.divudi.bean.common.SessionController; -import com.divudi.data.ApplicationInstitution; import com.divudi.data.BillType; import com.divudi.data.FeeType; import com.divudi.data.dataStructure.ChannelFee; @@ -34,7 +33,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.Objects; import javax.ejb.EJB; import javax.ejb.Stateless; import javax.inject.Inject; diff --git a/src/main/java/com/divudi/ejb/PharmacyBean.java b/src/main/java/com/divudi/ejb/PharmacyBean.java index 8074d5d74d..53431bfbb2 100644 --- a/src/main/java/com/divudi/ejb/PharmacyBean.java +++ b/src/main/java/com/divudi/ejb/PharmacyBean.java @@ -32,7 +32,6 @@ import com.divudi.entity.pharmacy.Vmp; import com.divudi.entity.pharmacy.Vmpp; import com.divudi.entity.pharmacy.Vtm; -import com.divudi.entity.pharmacy.VirtualProductIngredient; import com.divudi.facade.AmpFacade; import com.divudi.facade.AmppFacade; import com.divudi.facade.BillFacade; diff --git a/src/main/java/com/divudi/ejb/StockHistoryRecorder.java b/src/main/java/com/divudi/ejb/StockHistoryRecorder.java index da30923eb4..64170e248d 100644 --- a/src/main/java/com/divudi/ejb/StockHistoryRecorder.java +++ b/src/main/java/com/divudi/ejb/StockHistoryRecorder.java @@ -37,7 +37,6 @@ import java.util.Map; import javax.ejb.EJB; import javax.ejb.Stateless; -import javax.inject.Inject; import javax.persistence.TemporalType; /** diff --git a/src/main/java/com/divudi/entity/Area.java b/src/main/java/com/divudi/entity/Area.java index bfcdd6fbd9..952abbb613 100644 --- a/src/main/java/com/divudi/entity/Area.java +++ b/src/main/java/com/divudi/entity/Area.java @@ -12,7 +12,6 @@ import javax.persistence.Id; import javax.persistence.ManyToOne; import javax.persistence.Temporal; -import javax.xml.bind.annotation.XmlRootElement; @@ -25,7 +24,7 @@ * */ @Entity -@XmlRootElement + public class Area implements Serializable { static final long serialVersionUID = 1L; diff --git a/src/main/java/com/divudi/entity/AuditEvent.java b/src/main/java/com/divudi/entity/AuditEvent.java index a8520b951f..8bb9eb1007 100644 --- a/src/main/java/com/divudi/entity/AuditEvent.java +++ b/src/main/java/com/divudi/entity/AuditEvent.java @@ -7,7 +7,6 @@ import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.Lob; -import java.util.UUID; import javax.persistence.Column; /** diff --git a/src/main/java/com/divudi/entity/BilledBill.java b/src/main/java/com/divudi/entity/BilledBill.java index 0228b1a153..7a084c75e6 100644 --- a/src/main/java/com/divudi/entity/BilledBill.java +++ b/src/main/java/com/divudi/entity/BilledBill.java @@ -6,12 +6,7 @@ import com.divudi.data.BillClassType; import java.io.Serializable; -import java.util.List; -import javax.persistence.CascadeType; import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.OneToMany; -import javax.persistence.OrderBy; /** * diff --git a/src/main/java/com/divudi/entity/CategoryItem.java b/src/main/java/com/divudi/entity/CategoryItem.java index aac077c120..3ae605c2c1 100644 --- a/src/main/java/com/divudi/entity/CategoryItem.java +++ b/src/main/java/com/divudi/entity/CategoryItem.java @@ -1,6 +1,5 @@ package com.divudi.entity; -import com.fasterxml.jackson.annotation.JsonIgnore; import java.io.Serializable; import java.util.Date; import javax.persistence.Entity; diff --git a/src/main/java/com/divudi/entity/Department.java b/src/main/java/com/divudi/entity/Department.java index 5ac6c0f8e8..f5ffb3e4aa 100644 --- a/src/main/java/com/divudi/entity/Department.java +++ b/src/main/java/com/divudi/entity/Department.java @@ -15,17 +15,18 @@ import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; +import javax.persistence.Inheritance; import javax.persistence.Lob; import javax.persistence.ManyToOne; import javax.persistence.Temporal; -import javax.xml.bind.annotation.XmlRootElement; /** * * @author buddhika */ @Entity -@XmlRootElement +@Inheritance + public class Department implements Serializable { static final long serialVersionUID = 1L; diff --git a/src/main/java/com/divudi/entity/Form.java b/src/main/java/com/divudi/entity/Form.java index 12eff9b2a1..31ebecc096 100644 --- a/src/main/java/com/divudi/entity/Form.java +++ b/src/main/java/com/divudi/entity/Form.java @@ -14,7 +14,6 @@ import javax.persistence.Inheritance; import javax.persistence.ManyToOne; import javax.persistence.Temporal; -import javax.xml.bind.annotation.XmlRootElement; /** * @@ -22,7 +21,7 @@ */ @Entity @Inheritance -@XmlRootElement + public class Form implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/divudi/entity/Institution.java b/src/main/java/com/divudi/entity/Institution.java index 2d1c560af6..d775ff9bb1 100644 --- a/src/main/java/com/divudi/entity/Institution.java +++ b/src/main/java/com/divudi/entity/Institution.java @@ -26,7 +26,6 @@ import javax.persistence.OneToMany; import javax.persistence.Temporal; import javax.persistence.Transient; -import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlTransient; /** @@ -34,7 +33,6 @@ * @author buddhika */ @Entity -@XmlRootElement public class Institution implements Serializable, IdentifiableWithNameOrCode { static final long serialVersionUID = 1L; @@ -134,6 +132,7 @@ public class Institution implements Serializable, IdentifiableWithNameOrCode { String descreption; String accountNo; + @ManyToOne Institution bankBranch; String emailSendingUsername; @@ -145,6 +144,7 @@ public class Institution implements Serializable, IdentifiableWithNameOrCode { //Inactive Status private boolean inactive; + @ManyToOne private Institution parentInstitution; public String getEmailSendingUsername() { @@ -171,9 +171,9 @@ public void setPointOfIssueNo(String pointOfIssueNo) { this.pointOfIssueNo = pointOfIssueNo; } - public Institution() { - split(); - } +// public Institution() { +// split(); +// } public String getDescreption() { return descreption; diff --git a/src/main/java/com/divudi/entity/Patient.java b/src/main/java/com/divudi/entity/Patient.java index 9dcf521a94..c285e2b297 100644 --- a/src/main/java/com/divudi/entity/Patient.java +++ b/src/main/java/com/divudi/entity/Patient.java @@ -15,7 +15,6 @@ import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; -import javax.persistence.Index; import javax.persistence.Lob; import javax.persistence.ManyToOne; import javax.persistence.PostLoad; diff --git a/src/main/java/com/divudi/entity/PatientEncounter.java b/src/main/java/com/divudi/entity/PatientEncounter.java index b19f3662cb..0d97598d1f 100644 --- a/src/main/java/com/divudi/entity/PatientEncounter.java +++ b/src/main/java/com/divudi/entity/PatientEncounter.java @@ -32,7 +32,6 @@ import javax.persistence.OneToMany; import javax.persistence.Temporal; import javax.persistence.Transient; -import java.util.stream.Collectors; /** * diff --git a/src/main/java/com/divudi/entity/Payment.java b/src/main/java/com/divudi/entity/Payment.java index fbdd8fbaa2..761139246f 100644 --- a/src/main/java/com/divudi/entity/Payment.java +++ b/src/main/java/com/divudi/entity/Payment.java @@ -9,9 +9,7 @@ import java.io.Serializable; import java.util.ArrayList; import java.util.Date; -import java.util.HashMap; import java.util.List; -import java.util.Map; import javax.persistence.Entity; import javax.persistence.EnumType; import javax.persistence.Enumerated; diff --git a/src/main/java/com/divudi/entity/Route.java b/src/main/java/com/divudi/entity/Route.java index bc077661e0..bb8226e755 100644 --- a/src/main/java/com/divudi/entity/Route.java +++ b/src/main/java/com/divudi/entity/Route.java @@ -1,136 +1,15 @@ package com.divudi.entity; -import com.fasterxml.jackson.annotation.JsonIgnore; import java.io.Serializable; -import java.util.Date; import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Lob; -import javax.persistence.ManyToOne; -import javax.persistence.Temporal; /** * * @author Dr M H B Ariyaratne */ @Entity -public class Route implements Serializable { +public class Route extends Department implements Serializable { - private static final long serialVersionUID = 1L; - @Id - @GeneratedValue(strategy = GenerationType.AUTO) - private Long id; - - private String name; - @Lob - private String description; - - - //Created Properties - @ManyToOne - private WebUser creater; - @Temporal(javax.persistence.TemporalType.TIMESTAMP) - private Date createdAt; - //Retairing properties - private boolean retired; - @ManyToOne - private WebUser retirer; - @Temporal(javax.persistence.TemporalType.TIMESTAMP) - private Date retiredAt; - - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - - @Override - public int hashCode() { - int hash = 0; - hash += (id != null ? id.hashCode() : 0); - return hash; - } - - @Override - public boolean equals(Object object) { - // TODO: Warning - this method won't work in the case the id fields are not set - if (!(object instanceof Route)) { - return false; - } - Route other = (Route) object; - if ((this.id == null && other.id != null) || (this.id != null && !this.id.equals(other.id))) { - return false; - } - return true; - } - - @Override - public String toString() { - return "com.divudi.entity.Route[ id=" + id + " ]"; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public WebUser getCreater() { - return creater; - } - - public void setCreater(WebUser creater) { - this.creater = creater; - } - - public Date getCreatedAt() { - return createdAt; - } - - public void setCreatedAt(Date createdAt) { - this.createdAt = createdAt; - } - - public WebUser getRetirer() { - return retirer; - } - - public void setRetirer(WebUser retirer) { - this.retirer = retirer; - } - - public Date getRetiredAt() { - return retiredAt; - } - - public void setRetiredAt(Date retiredAt) { - this.retiredAt = retiredAt; - } - - public boolean isRetired() { - return retired; - } - - public void setRetired(boolean retired) { - this.retired = retired; - } - } diff --git a/src/main/java/com/divudi/entity/Sms.java b/src/main/java/com/divudi/entity/Sms.java index 2dc2b93027..12961779a7 100644 --- a/src/main/java/com/divudi/entity/Sms.java +++ b/src/main/java/com/divudi/entity/Sms.java @@ -13,13 +13,11 @@ import javax.persistence.Entity; import javax.persistence.EnumType; import javax.persistence.Enumerated; -import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.Lob; import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; import javax.persistence.Temporal; /** diff --git a/src/main/java/com/divudi/entity/Staff.java b/src/main/java/com/divudi/entity/Staff.java index 1775ac7027..a558dd5915 100644 --- a/src/main/java/com/divudi/entity/Staff.java +++ b/src/main/java/com/divudi/entity/Staff.java @@ -34,7 +34,6 @@ import javax.persistence.OneToOne; import javax.persistence.Temporal; import javax.persistence.Transient; -import javax.xml.bind.annotation.XmlRootElement; /** * diff --git a/src/main/java/com/divudi/entity/Token.java b/src/main/java/com/divudi/entity/Token.java index b57e193271..a4cd62d64c 100644 --- a/src/main/java/com/divudi/entity/Token.java +++ b/src/main/java/com/divudi/entity/Token.java @@ -6,7 +6,6 @@ import javax.persistence.Entity; import javax.persistence.EnumType; import javax.persistence.Enumerated; -import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; diff --git a/src/main/java/com/divudi/entity/UserNotification.java b/src/main/java/com/divudi/entity/UserNotification.java index 4daa33586d..090556592a 100644 --- a/src/main/java/com/divudi/entity/UserNotification.java +++ b/src/main/java/com/divudi/entity/UserNotification.java @@ -6,7 +6,6 @@ import java.io.Serializable; import java.util.Date; -import javax.persistence.CascadeType; import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; diff --git a/src/main/java/com/divudi/entity/WebTheme.java b/src/main/java/com/divudi/entity/WebTheme.java index 5c17fc33d7..cf545d72f4 100644 --- a/src/main/java/com/divudi/entity/WebTheme.java +++ b/src/main/java/com/divudi/entity/WebTheme.java @@ -15,14 +15,13 @@ import javax.persistence.Id; import javax.persistence.ManyToOne; import javax.persistence.Temporal; -import javax.xml.bind.annotation.XmlRootElement; /** * * @author Dr. M. H. B. Ariyaratne, MBBS, MSc, MD(Health Informatics) Informatics) */ @Entity -@XmlRootElement + public class WebTheme implements Serializable { static final long serialVersionUID = 1L; @Id diff --git a/src/main/java/com/divudi/entity/WebUser.java b/src/main/java/com/divudi/entity/WebUser.java index def22a47e5..ce8d48b503 100644 --- a/src/main/java/com/divudi/entity/WebUser.java +++ b/src/main/java/com/divudi/entity/WebUser.java @@ -23,8 +23,6 @@ import javax.persistence.ManyToOne; import javax.persistence.OneToOne; import javax.persistence.Temporal; -import javax.xml.bind.annotation.XmlRootElement; -import org.checkerframework.common.value.qual.EnumVal; /** * @@ -32,7 +30,7 @@ * Consultant (Health Informatics) */ @Entity -@XmlRootElement + public class WebUser implements Serializable { static final long serialVersionUID = 1L; diff --git a/src/main/java/com/divudi/entity/WebUserRoleUser.java b/src/main/java/com/divudi/entity/WebUserRoleUser.java index e8767a6e6a..78b2fc46ba 100644 --- a/src/main/java/com/divudi/entity/WebUserRoleUser.java +++ b/src/main/java/com/divudi/entity/WebUserRoleUser.java @@ -4,12 +4,9 @@ */ package com.divudi.entity; -import com.divudi.data.TriggerType; import java.io.Serializable; import java.util.Date; import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; diff --git a/src/main/java/com/divudi/entity/channel/PatientSessionInstanceActivity.java b/src/main/java/com/divudi/entity/channel/PatientSessionInstanceActivity.java index ff8c99d54d..385ee54b22 100644 --- a/src/main/java/com/divudi/entity/channel/PatientSessionInstanceActivity.java +++ b/src/main/java/com/divudi/entity/channel/PatientSessionInstanceActivity.java @@ -11,7 +11,6 @@ import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; /** * diff --git a/src/main/java/com/divudi/entity/clinical/DocumentTemplate.java b/src/main/java/com/divudi/entity/clinical/DocumentTemplate.java index 8830b4fe71..d733d1b962 100644 --- a/src/main/java/com/divudi/entity/clinical/DocumentTemplate.java +++ b/src/main/java/com/divudi/entity/clinical/DocumentTemplate.java @@ -7,7 +7,6 @@ import com.divudi.entity.WebUser; import java.io.Serializable; import java.util.Date; -import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; diff --git a/src/main/java/com/divudi/entity/clinical/Prescription.java b/src/main/java/com/divudi/entity/clinical/Prescription.java index f48da2e61e..627dcc2e03 100644 --- a/src/main/java/com/divudi/entity/clinical/Prescription.java +++ b/src/main/java/com/divudi/entity/clinical/Prescription.java @@ -12,7 +12,6 @@ import com.divudi.entity.Patient; import com.divudi.entity.PatientEncounter; import com.divudi.entity.WebUser; -import com.divudi.entity.pharmacy.FrequencyUnit; import com.divudi.entity.pharmacy.MeasurementUnit; import java.io.Serializable; import java.text.DecimalFormat; diff --git a/src/main/java/com/divudi/entity/hr/AdditionalForm.java b/src/main/java/com/divudi/entity/hr/AdditionalForm.java index cd916e0eb8..8ed4e7bc1f 100644 --- a/src/main/java/com/divudi/entity/hr/AdditionalForm.java +++ b/src/main/java/com/divudi/entity/hr/AdditionalForm.java @@ -7,10 +7,9 @@ package com.divudi.entity.hr; import javax.persistence.Entity; -import javax.xml.bind.annotation.XmlRootElement; @Entity -@XmlRootElement + public class AdditionalForm extends HrForm { diff --git a/src/main/java/com/divudi/entity/hr/BankAccount.java b/src/main/java/com/divudi/entity/hr/BankAccount.java index a71bc3e15e..4855f7e49d 100644 --- a/src/main/java/com/divudi/entity/hr/BankAccount.java +++ b/src/main/java/com/divudi/entity/hr/BankAccount.java @@ -12,14 +12,13 @@ import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.ManyToOne; -import javax.xml.bind.annotation.XmlRootElement; /** * * @author safrin */ @Entity -@XmlRootElement + public class BankAccount implements Serializable { // @OneToOne(mappedBy = "bankAccount") private Staff staff; diff --git a/src/main/java/com/divudi/entity/hr/BasicSalary.java b/src/main/java/com/divudi/entity/hr/BasicSalary.java index 59417f03c5..e7f2ef4eae 100644 --- a/src/main/java/com/divudi/entity/hr/BasicSalary.java +++ b/src/main/java/com/divudi/entity/hr/BasicSalary.java @@ -7,14 +7,13 @@ import com.divudi.data.hr.PaysheetComponentType; import java.io.Serializable; import javax.persistence.Entity; -import javax.xml.bind.annotation.XmlRootElement; /** * * @author Buddhika */ @Entity -@XmlRootElement + public class BasicSalary extends PaysheetComponent implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/divudi/entity/hr/Designation.java b/src/main/java/com/divudi/entity/hr/Designation.java index d2313059d2..1ac6b49174 100644 --- a/src/main/java/com/divudi/entity/hr/Designation.java +++ b/src/main/java/com/divudi/entity/hr/Designation.java @@ -10,7 +10,6 @@ import java.util.List; import javax.persistence.Entity; import javax.persistence.OneToMany; -import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlTransient; /** @@ -18,7 +17,7 @@ * @author buddhika */ @Entity -@XmlRootElement + public class Designation extends Category implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/divudi/entity/hr/FingerPrintRecord.java b/src/main/java/com/divudi/entity/hr/FingerPrintRecord.java index a2fb1c4215..ca42bca387 100644 --- a/src/main/java/com/divudi/entity/hr/FingerPrintRecord.java +++ b/src/main/java/com/divudi/entity/hr/FingerPrintRecord.java @@ -26,7 +26,6 @@ import javax.persistence.Temporal; import javax.persistence.TemporalType; import javax.persistence.Transient; -import javax.xml.bind.annotation.XmlRootElement; /** * @@ -34,7 +33,7 @@ */ @Entity @Inheritance -@XmlRootElement + public class FingerPrintRecord implements Serializable { @OneToOne(mappedBy = "loggedRecord") diff --git a/src/main/java/com/divudi/entity/hr/FingerPrintRecordHistory.java b/src/main/java/com/divudi/entity/hr/FingerPrintRecordHistory.java index e19d91ddcc..eaaf65d0c2 100644 --- a/src/main/java/com/divudi/entity/hr/FingerPrintRecordHistory.java +++ b/src/main/java/com/divudi/entity/hr/FingerPrintRecordHistory.java @@ -15,14 +15,13 @@ import javax.persistence.Id; import javax.persistence.ManyToOne; import javax.persistence.Temporal; -import javax.xml.bind.annotation.XmlRootElement; /** * * @author safrin */ @Entity -@XmlRootElement + public class FingerPrintRecordHistory implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/divudi/entity/hr/Grade.java b/src/main/java/com/divudi/entity/hr/Grade.java index 4682e63329..80e2523a90 100644 --- a/src/main/java/com/divudi/entity/hr/Grade.java +++ b/src/main/java/com/divudi/entity/hr/Grade.java @@ -10,7 +10,6 @@ import java.util.List; import javax.persistence.Entity; import javax.persistence.OneToMany; -import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlTransient; /** @@ -18,7 +17,7 @@ * @author buddhika */ @Entity -@XmlRootElement + public class Grade extends Category implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/divudi/entity/hr/HrmVariables.java b/src/main/java/com/divudi/entity/hr/HrmVariables.java index 672f504c24..2fa8606dfc 100644 --- a/src/main/java/com/divudi/entity/hr/HrmVariables.java +++ b/src/main/java/com/divudi/entity/hr/HrmVariables.java @@ -19,7 +19,6 @@ import javax.persistence.ManyToOne; import javax.persistence.OneToMany; import javax.persistence.Temporal; -import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlTransient; /** @@ -27,7 +26,7 @@ * @author Buddhika */ @Entity -@XmlRootElement + public class HrmVariables implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/divudi/entity/hr/LeaveForm.java b/src/main/java/com/divudi/entity/hr/LeaveForm.java index b8c55d6276..42599e467c 100644 --- a/src/main/java/com/divudi/entity/hr/LeaveForm.java +++ b/src/main/java/com/divudi/entity/hr/LeaveForm.java @@ -13,10 +13,9 @@ import javax.persistence.ManyToOne; import javax.persistence.Temporal; import javax.persistence.TemporalType; -import javax.xml.bind.annotation.XmlRootElement; @Entity -@XmlRootElement + public class LeaveForm extends HrForm { @Temporal(TemporalType.TIMESTAMP) diff --git a/src/main/java/com/divudi/entity/hr/LeaveFormSystem.java b/src/main/java/com/divudi/entity/hr/LeaveFormSystem.java index 24b5a1baf7..9bedd02599 100644 --- a/src/main/java/com/divudi/entity/hr/LeaveFormSystem.java +++ b/src/main/java/com/divudi/entity/hr/LeaveFormSystem.java @@ -6,10 +6,9 @@ package com.divudi.entity.hr; import javax.persistence.Entity; -import javax.xml.bind.annotation.XmlRootElement; @Entity -@XmlRootElement + public class LeaveFormSystem extends LeaveForm { diff --git a/src/main/java/com/divudi/entity/hr/Loan.java b/src/main/java/com/divudi/entity/hr/Loan.java index 4e1d867ebe..9611df35e9 100644 --- a/src/main/java/com/divudi/entity/hr/Loan.java +++ b/src/main/java/com/divudi/entity/hr/Loan.java @@ -16,14 +16,13 @@ import javax.persistence.Id; import javax.persistence.ManyToOne; import javax.persistence.Temporal; -import javax.xml.bind.annotation.XmlRootElement; /** * * @author safrin */ @Entity -@XmlRootElement + public class Loan implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/divudi/entity/hr/PayeeTaxRange.java b/src/main/java/com/divudi/entity/hr/PayeeTaxRange.java index 1bae86cab2..fcdebff2ab 100644 --- a/src/main/java/com/divudi/entity/hr/PayeeTaxRange.java +++ b/src/main/java/com/divudi/entity/hr/PayeeTaxRange.java @@ -10,14 +10,13 @@ import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.ManyToOne; -import javax.xml.bind.annotation.XmlRootElement; /** * * @author safrin */ @Entity -@XmlRootElement + public class PayeeTaxRange implements Serializable { @ManyToOne private HrmVariables hrmVariables; diff --git a/src/main/java/com/divudi/entity/hr/PaysheetComponent.java b/src/main/java/com/divudi/entity/hr/PaysheetComponent.java index c57de831a9..b837f87469 100644 --- a/src/main/java/com/divudi/entity/hr/PaysheetComponent.java +++ b/src/main/java/com/divudi/entity/hr/PaysheetComponent.java @@ -21,7 +21,6 @@ import javax.persistence.OneToOne; import javax.persistence.Temporal; import javax.persistence.Transient; -import javax.xml.bind.annotation.XmlRootElement; /** * @@ -29,7 +28,7 @@ */ @Entity @Inheritance -@XmlRootElement + public class PaysheetComponent implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/divudi/entity/hr/PhDate.java b/src/main/java/com/divudi/entity/hr/PhDate.java index 2d67ea34c9..b0d1a54f00 100644 --- a/src/main/java/com/divudi/entity/hr/PhDate.java +++ b/src/main/java/com/divudi/entity/hr/PhDate.java @@ -17,14 +17,13 @@ import javax.persistence.Id; import javax.persistence.ManyToOne; import javax.persistence.Temporal; -import javax.xml.bind.annotation.XmlRootElement; /** * * @author safrin */ @Entity -@XmlRootElement + public class PhDate implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/divudi/entity/hr/Roster.java b/src/main/java/com/divudi/entity/hr/Roster.java index 24e4ade835..e238a886b0 100644 --- a/src/main/java/com/divudi/entity/hr/Roster.java +++ b/src/main/java/com/divudi/entity/hr/Roster.java @@ -22,7 +22,6 @@ import javax.persistence.OneToMany; import javax.persistence.OneToOne; import javax.persistence.Temporal; -import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlTransient; /** @@ -30,7 +29,7 @@ * @author safrin */ @Entity -@XmlRootElement + public class Roster implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/divudi/entity/hr/SalaryCycle.java b/src/main/java/com/divudi/entity/hr/SalaryCycle.java index 202871aea7..9d2ff9d399 100644 --- a/src/main/java/com/divudi/entity/hr/SalaryCycle.java +++ b/src/main/java/com/divudi/entity/hr/SalaryCycle.java @@ -16,14 +16,13 @@ import javax.persistence.Id; import javax.persistence.ManyToOne; import javax.persistence.Temporal; -import javax.xml.bind.annotation.XmlRootElement; /** * * @author Buddhika */ @Entity -@XmlRootElement + public class SalaryCycle implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/divudi/entity/hr/SalaryHold.java b/src/main/java/com/divudi/entity/hr/SalaryHold.java index bfd6c1cec9..f294db0db2 100644 --- a/src/main/java/com/divudi/entity/hr/SalaryHold.java +++ b/src/main/java/com/divudi/entity/hr/SalaryHold.java @@ -15,14 +15,13 @@ import javax.persistence.Lob; import javax.persistence.ManyToOne; import javax.persistence.Temporal; -import javax.xml.bind.annotation.XmlRootElement; /** * * @author Buddhika */ @Entity -@XmlRootElement + public class SalaryHold implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/divudi/entity/hr/Shift.java b/src/main/java/com/divudi/entity/hr/Shift.java index d4b2545560..115ef5deb2 100644 --- a/src/main/java/com/divudi/entity/hr/Shift.java +++ b/src/main/java/com/divudi/entity/hr/Shift.java @@ -25,7 +25,6 @@ import javax.persistence.OneToOne; import javax.persistence.Temporal; import javax.persistence.Transient; -import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlTransient; /** @@ -33,7 +32,7 @@ * @author safrin */ @Entity -@XmlRootElement + public class Shift implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/divudi/entity/hr/ShiftAmendment.java b/src/main/java/com/divudi/entity/hr/ShiftAmendment.java index aeb481ae42..2533c96fc3 100644 --- a/src/main/java/com/divudi/entity/hr/ShiftAmendment.java +++ b/src/main/java/com/divudi/entity/hr/ShiftAmendment.java @@ -15,14 +15,13 @@ import javax.persistence.Id; import javax.persistence.ManyToOne; import javax.persistence.Temporal; -import javax.xml.bind.annotation.XmlRootElement; /** * * @author safrin */ @Entity -@XmlRootElement + public class ShiftAmendment implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/divudi/entity/hr/ShiftPreference.java b/src/main/java/com/divudi/entity/hr/ShiftPreference.java index 3a1b3c8e7a..8af5e6e8a1 100644 --- a/src/main/java/com/divudi/entity/hr/ShiftPreference.java +++ b/src/main/java/com/divudi/entity/hr/ShiftPreference.java @@ -17,14 +17,13 @@ import javax.persistence.ManyToOne; import javax.persistence.OneToOne; import javax.persistence.Temporal; -import javax.xml.bind.annotation.XmlRootElement; /** * * @author safrin */ @Entity -@XmlRootElement + public class ShiftPreference implements Serializable { @OneToOne(mappedBy = "shiftPreference") private Shift shift; diff --git a/src/main/java/com/divudi/entity/hr/StaffBasics.java b/src/main/java/com/divudi/entity/hr/StaffBasics.java index ba35ccdbda..25dacbc798 100644 --- a/src/main/java/com/divudi/entity/hr/StaffBasics.java +++ b/src/main/java/com/divudi/entity/hr/StaffBasics.java @@ -14,14 +14,13 @@ import javax.persistence.ManyToOne; import javax.persistence.OneToOne; import javax.persistence.Temporal; -import javax.xml.bind.annotation.XmlRootElement; /** * * @author safrin */ @Entity -@XmlRootElement + public class StaffBasics implements Serializable { @ManyToOne diff --git a/src/main/java/com/divudi/entity/hr/StaffDesignation.java b/src/main/java/com/divudi/entity/hr/StaffDesignation.java index 652e73d17a..5b08de125c 100644 --- a/src/main/java/com/divudi/entity/hr/StaffDesignation.java +++ b/src/main/java/com/divudi/entity/hr/StaffDesignation.java @@ -14,14 +14,13 @@ import javax.persistence.ManyToOne; import javax.persistence.OneToOne; import javax.persistence.Temporal; -import javax.xml.bind.annotation.XmlRootElement; /** * * @author safrin */ @Entity -@XmlRootElement + public class StaffDesignation implements Serializable { @ManyToOne diff --git a/src/main/java/com/divudi/entity/hr/StaffEmployeeStatus.java b/src/main/java/com/divudi/entity/hr/StaffEmployeeStatus.java index 4acfe9643b..8c73cc82f3 100644 --- a/src/main/java/com/divudi/entity/hr/StaffEmployeeStatus.java +++ b/src/main/java/com/divudi/entity/hr/StaffEmployeeStatus.java @@ -16,14 +16,13 @@ import javax.persistence.Id; import javax.persistence.ManyToOne; import javax.persistence.Temporal; -import javax.xml.bind.annotation.XmlRootElement; /** * * @author safrin */ @Entity -@XmlRootElement + public class StaffEmployeeStatus implements Serializable { @ManyToOne diff --git a/src/main/java/com/divudi/entity/hr/StaffEmployment.java b/src/main/java/com/divudi/entity/hr/StaffEmployment.java index cbb96c835a..81cda1fbcf 100644 --- a/src/main/java/com/divudi/entity/hr/StaffEmployment.java +++ b/src/main/java/com/divudi/entity/hr/StaffEmployment.java @@ -25,7 +25,6 @@ import javax.persistence.OneToMany; import javax.persistence.OneToOne; import javax.persistence.Temporal; -import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlTransient; /** @@ -33,7 +32,7 @@ * @author safrin */ @Entity -@XmlRootElement + public class StaffEmployment implements Serializable { @OneToMany(mappedBy = "staffEmployment", cascade = CascadeType.ALL, fetch = FetchType.LAZY) diff --git a/src/main/java/com/divudi/entity/hr/StaffGrade.java b/src/main/java/com/divudi/entity/hr/StaffGrade.java index 7c2ce9e235..a5c32d98bb 100644 --- a/src/main/java/com/divudi/entity/hr/StaffGrade.java +++ b/src/main/java/com/divudi/entity/hr/StaffGrade.java @@ -14,14 +14,13 @@ import javax.persistence.ManyToOne; import javax.persistence.OneToOne; import javax.persistence.Temporal; -import javax.xml.bind.annotation.XmlRootElement; /** * * @author safrin */ @Entity -@XmlRootElement + public class StaffGrade implements Serializable { @ManyToOne private StaffEmployment staffEmployment; diff --git a/src/main/java/com/divudi/entity/hr/StaffLeave.java b/src/main/java/com/divudi/entity/hr/StaffLeave.java index dd7cfecc60..8021dbf2e9 100644 --- a/src/main/java/com/divudi/entity/hr/StaffLeave.java +++ b/src/main/java/com/divudi/entity/hr/StaffLeave.java @@ -20,7 +20,6 @@ import javax.persistence.ManyToOne; import javax.persistence.OneToOne; import javax.persistence.Temporal; -import javax.xml.bind.annotation.XmlRootElement; /** * @@ -28,7 +27,7 @@ */ @Entity @Inheritance -@XmlRootElement + public class StaffLeave implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/divudi/entity/hr/StaffLeaveEntitle.java b/src/main/java/com/divudi/entity/hr/StaffLeaveEntitle.java index 1f1e7bfb52..0d97239680 100644 --- a/src/main/java/com/divudi/entity/hr/StaffLeaveEntitle.java +++ b/src/main/java/com/divudi/entity/hr/StaffLeaveEntitle.java @@ -19,14 +19,13 @@ import javax.persistence.ManyToOne; import javax.persistence.Temporal; import javax.persistence.TemporalType; -import javax.xml.bind.annotation.XmlRootElement; /** * * @author safrin */ @Entity -@XmlRootElement + public class StaffLeaveEntitle implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/divudi/entity/hr/StaffLeaveSystem.java b/src/main/java/com/divudi/entity/hr/StaffLeaveSystem.java index d0073bc957..e7ad96d0b3 100644 --- a/src/main/java/com/divudi/entity/hr/StaffLeaveSystem.java +++ b/src/main/java/com/divudi/entity/hr/StaffLeaveSystem.java @@ -6,14 +6,13 @@ package com.divudi.entity.hr; import javax.persistence.Entity; -import javax.xml.bind.annotation.XmlRootElement; /** * * @author Buddhika */ @Entity -@XmlRootElement + public class StaffLeaveSystem extends StaffLeave { } diff --git a/src/main/java/com/divudi/entity/hr/StaffPaysheetComponent.java b/src/main/java/com/divudi/entity/hr/StaffPaysheetComponent.java index 42e3991b65..b3f3951a10 100644 --- a/src/main/java/com/divudi/entity/hr/StaffPaysheetComponent.java +++ b/src/main/java/com/divudi/entity/hr/StaffPaysheetComponent.java @@ -17,14 +17,13 @@ import javax.persistence.Temporal; import javax.persistence.TemporalType; import javax.persistence.Transient; -import javax.xml.bind.annotation.XmlRootElement; /** * * @author safrin */ @Entity -@XmlRootElement + public class StaffPaysheetComponent implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/divudi/entity/hr/StaffSalary.java b/src/main/java/com/divudi/entity/hr/StaffSalary.java index b1568f8840..fdb15bb0e6 100644 --- a/src/main/java/com/divudi/entity/hr/StaffSalary.java +++ b/src/main/java/com/divudi/entity/hr/StaffSalary.java @@ -25,7 +25,6 @@ import javax.persistence.Temporal; import javax.persistence.TemporalType; import javax.persistence.Transient; -import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlTransient; /** @@ -33,7 +32,7 @@ * @author Buddhika */ @Entity -@XmlRootElement + public class StaffSalary implements Serializable { @OneToMany(mappedBy = "staffSalary", fetch = FetchType.EAGER) diff --git a/src/main/java/com/divudi/entity/hr/StaffSalaryComponant.java b/src/main/java/com/divudi/entity/hr/StaffSalaryComponant.java index a4ec72de24..1c7852b488 100644 --- a/src/main/java/com/divudi/entity/hr/StaffSalaryComponant.java +++ b/src/main/java/com/divudi/entity/hr/StaffSalaryComponant.java @@ -18,14 +18,13 @@ import javax.persistence.ManyToOne; import javax.persistence.Temporal; import javax.persistence.Transient; -import javax.xml.bind.annotation.XmlRootElement; /** * * @author Buddhika */ @Entity -@XmlRootElement + public class StaffSalaryComponant implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/divudi/entity/hr/StaffShift.java b/src/main/java/com/divudi/entity/hr/StaffShift.java index 80bd59064b..dee4ad3beb 100644 --- a/src/main/java/com/divudi/entity/hr/StaffShift.java +++ b/src/main/java/com/divudi/entity/hr/StaffShift.java @@ -31,7 +31,6 @@ import javax.persistence.Temporal; import javax.persistence.TemporalType; import javax.persistence.Transient; -import javax.xml.bind.annotation.XmlRootElement; /** * @@ -39,7 +38,7 @@ */ @Entity @Inheritance -@XmlRootElement + public class StaffShift implements Serializable { @ManyToOne diff --git a/src/main/java/com/divudi/entity/hr/StaffShiftAmendment.java b/src/main/java/com/divudi/entity/hr/StaffShiftAmendment.java index 9d2a61df0a..5e0a4b2339 100644 --- a/src/main/java/com/divudi/entity/hr/StaffShiftAmendment.java +++ b/src/main/java/com/divudi/entity/hr/StaffShiftAmendment.java @@ -6,14 +6,13 @@ import java.io.Serializable; import javax.persistence.Entity; -import javax.xml.bind.annotation.XmlRootElement; /** * * @author buddhika */ @Entity -@XmlRootElement + public class StaffShiftAmendment extends StaffShift implements Serializable { diff --git a/src/main/java/com/divudi/entity/hr/StaffShiftExtra.java b/src/main/java/com/divudi/entity/hr/StaffShiftExtra.java index 7fa240a121..b524fb9729 100644 --- a/src/main/java/com/divudi/entity/hr/StaffShiftExtra.java +++ b/src/main/java/com/divudi/entity/hr/StaffShiftExtra.java @@ -6,14 +6,13 @@ import java.io.Serializable; import javax.persistence.Entity; -import javax.xml.bind.annotation.XmlRootElement; /** * * @author buddhika */ @Entity -@XmlRootElement + public class StaffShiftExtra extends StaffShift implements Serializable { diff --git a/src/main/java/com/divudi/entity/hr/StaffShiftHistory.java b/src/main/java/com/divudi/entity/hr/StaffShiftHistory.java index cdb871ec6e..62e5e81a1f 100644 --- a/src/main/java/com/divudi/entity/hr/StaffShiftHistory.java +++ b/src/main/java/com/divudi/entity/hr/StaffShiftHistory.java @@ -15,14 +15,13 @@ import javax.persistence.Id; import javax.persistence.ManyToOne; import javax.persistence.Temporal; -import javax.xml.bind.annotation.XmlRootElement; /** * * @author safrin */ @Entity -@XmlRootElement + public class StaffShiftHistory implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/divudi/entity/hr/StaffShiftReplace.java b/src/main/java/com/divudi/entity/hr/StaffShiftReplace.java index e828c694ed..5e980c2b33 100644 --- a/src/main/java/com/divudi/entity/hr/StaffShiftReplace.java +++ b/src/main/java/com/divudi/entity/hr/StaffShiftReplace.java @@ -6,14 +6,13 @@ import java.io.Serializable; import javax.persistence.Entity; -import javax.xml.bind.annotation.XmlRootElement; /** * * @author buddhika */ @Entity -@XmlRootElement + public class StaffShiftReplace extends StaffShift implements Serializable { diff --git a/src/main/java/com/divudi/entity/hr/StaffStaffCategory.java b/src/main/java/com/divudi/entity/hr/StaffStaffCategory.java index 0ee2e4b09f..9be48ce6b7 100644 --- a/src/main/java/com/divudi/entity/hr/StaffStaffCategory.java +++ b/src/main/java/com/divudi/entity/hr/StaffStaffCategory.java @@ -14,14 +14,13 @@ import javax.persistence.ManyToOne; import javax.persistence.OneToOne; import javax.persistence.Temporal; -import javax.xml.bind.annotation.XmlRootElement; /** * * @author safrin */ @Entity -@XmlRootElement + public class StaffStaffCategory implements Serializable { @ManyToOne diff --git a/src/main/java/com/divudi/entity/hr/StaffWorkDay.java b/src/main/java/com/divudi/entity/hr/StaffWorkDay.java index 022dfab727..f65006b315 100644 --- a/src/main/java/com/divudi/entity/hr/StaffWorkDay.java +++ b/src/main/java/com/divudi/entity/hr/StaffWorkDay.java @@ -15,14 +15,13 @@ import javax.persistence.Id; import javax.persistence.ManyToOne; import javax.persistence.Temporal; -import javax.xml.bind.annotation.XmlRootElement; /** * * @author safrin */ @Entity -@XmlRootElement + public class StaffWorkDay implements Serializable { private static final long serialVersionUID = 1L; @Id diff --git a/src/main/java/com/divudi/entity/hr/StaffWorkingDepartment.java b/src/main/java/com/divudi/entity/hr/StaffWorkingDepartment.java index 7642235889..dfebaa3477 100644 --- a/src/main/java/com/divudi/entity/hr/StaffWorkingDepartment.java +++ b/src/main/java/com/divudi/entity/hr/StaffWorkingDepartment.java @@ -15,14 +15,13 @@ import javax.persistence.ManyToOne; import javax.persistence.OneToOne; import javax.persistence.Temporal; -import javax.xml.bind.annotation.XmlRootElement; /** * * @author safrin */ @Entity -@XmlRootElement + public class StaffWorkingDepartment implements Serializable { @ManyToOne diff --git a/src/main/java/com/divudi/entity/hr/TransferForm.java b/src/main/java/com/divudi/entity/hr/TransferForm.java index 6df9a367c0..9bf707f6ea 100644 --- a/src/main/java/com/divudi/entity/hr/TransferForm.java +++ b/src/main/java/com/divudi/entity/hr/TransferForm.java @@ -6,9 +6,8 @@ package com.divudi.entity.hr; import javax.persistence.Entity; -import javax.xml.bind.annotation.XmlRootElement; @Entity -@XmlRootElement + public class TransferForm extends HrForm { } diff --git a/src/main/java/com/divudi/entity/hr/WorkingTime.java b/src/main/java/com/divudi/entity/hr/WorkingTime.java index ccf8f47588..9b997342fa 100644 --- a/src/main/java/com/divudi/entity/hr/WorkingTime.java +++ b/src/main/java/com/divudi/entity/hr/WorkingTime.java @@ -20,14 +20,13 @@ import javax.persistence.OneToOne; import javax.persistence.Temporal; import javax.persistence.Transient; -import javax.xml.bind.annotation.XmlRootElement; /** * * @author Buddhika */ @Entity -@XmlRootElement + public class WorkingTime implements Serializable { @OneToOne(mappedBy = "continuedTo") diff --git a/src/main/java/com/divudi/entity/pharmacy/DiscardCategory.java b/src/main/java/com/divudi/entity/pharmacy/DiscardCategory.java index 3b27975f95..711c592103 100644 --- a/src/main/java/com/divudi/entity/pharmacy/DiscardCategory.java +++ b/src/main/java/com/divudi/entity/pharmacy/DiscardCategory.java @@ -7,7 +7,6 @@ import com.divudi.entity.Category; import java.io.Serializable; import javax.persistence.Entity; -import javax.xml.bind.annotation.XmlRootElement; /** @@ -15,7 +14,7 @@ * @author buddhika */ @Entity -@XmlRootElement + public class DiscardCategory extends Category implements Serializable { } diff --git a/src/main/java/com/divudi/entity/pharmacy/PharmaceuticalBillItem.java b/src/main/java/com/divudi/entity/pharmacy/PharmaceuticalBillItem.java index 4d7fac3099..65b4afd423 100644 --- a/src/main/java/com/divudi/entity/pharmacy/PharmaceuticalBillItem.java +++ b/src/main/java/com/divudi/entity/pharmacy/PharmaceuticalBillItem.java @@ -10,13 +10,11 @@ import com.divudi.entity.Institution; import java.io.Serializable; import java.util.Date; -import javax.persistence.CascadeType; import javax.persistence.Entity; import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; -import javax.persistence.JoinColumn; import javax.persistence.Lob; import javax.persistence.ManyToOne; import javax.persistence.OneToOne; diff --git a/src/main/java/com/divudi/facade/forms/ComponentAssignmentFacade.java b/src/main/java/com/divudi/facade/forms/ComponentAssignmentFacade.java index 19a1112098..958f02187b 100644 --- a/src/main/java/com/divudi/facade/forms/ComponentAssignmentFacade.java +++ b/src/main/java/com/divudi/facade/forms/ComponentAssignmentFacade.java @@ -7,7 +7,6 @@ import com.divudi.entity.forms.ComponentAsignment; -import com.divudi.entity.web.WebTemplate; import com.divudi.facade.AbstractFacade; import javax.ejb.Stateless; import javax.persistence.EntityManager; diff --git a/src/main/java/com/divudi/ws/lims/Lims.java b/src/main/java/com/divudi/ws/lims/Lims.java index 13ddb65acd..4c50cc0763 100644 --- a/src/main/java/com/divudi/ws/lims/Lims.java +++ b/src/main/java/com/divudi/ws/lims/Lims.java @@ -29,7 +29,6 @@ import com.divudi.facade.WebUserFacade; import com.divudi.data.BillType; import com.divudi.data.BillTypeAtomic; -import com.divudi.data.ItemBarcodeGenerationStrategy; import java.util.ArrayList; import java.util.Date; import java.util.HashMap; @@ -46,7 +45,6 @@ import org.json.JSONArray; import org.json.JSONObject; import com.divudi.data.LoginRequest; -import com.divudi.data.inward.SurgeryBillType; import com.divudi.entity.Patient; import com.divudi.entity.Person; import com.divudi.entity.pharmacy.Stock; diff --git a/src/main/java/com/divudi/ws/lims/LimsMiddlewareController.java b/src/main/java/com/divudi/ws/lims/LimsMiddlewareController.java index 3c77ecb51a..265c414347 100644 --- a/src/main/java/com/divudi/ws/lims/LimsMiddlewareController.java +++ b/src/main/java/com/divudi/ws/lims/LimsMiddlewareController.java @@ -46,9 +46,6 @@ import com.divudi.data.InvestigationItemValueType; import com.divudi.data.lab.SysMex; -import com.divudi.data.lab.SysMexOld; -import com.divudi.data.lab.SysMexAdf1; -import com.divudi.data.lab.SysMexAdf2; import com.divudi.data.lab.SysMexTypeA; import com.divudi.entity.Department; import com.divudi.entity.Institution; diff --git a/src/main/resources/META-INF/persistence.xml b/src/main/resources/META-INF/persistence.xml index 5d9f348894..48caf9db30 100644 --- a/src/main/resources/META-INF/persistence.xml +++ b/src/main/resources/META-INF/persistence.xml @@ -1,23 +1,22 @@ - - org.eclipse.persistence.jpa.PersistenceProvider - jdbc/arogya - false - - - - - - - - jdbc/arogyaAudit - com.divudi.entity.AuditEvent - true - - - - - - + + jdbc/sethma + false + + + + + + + + jdbc/sethmaaudit + false + + + + + + + diff --git a/src/main/resources/VERSION.txt b/src/main/resources/VERSION.txt index db67373c34..d8bf854ac9 100644 --- a/src/main/resources/VERSION.txt +++ b/src/main/resources/VERSION.txt @@ -1 +1 @@ -3.0.0.20240803.5 +3.0.0.20240807.2 diff --git a/src/main/webapp/WEB-INF/glassfish-web.xml b/src/main/webapp/WEB-INF/glassfish-web.xml index fd0ecf51a1..9841584308 100644 --- a/src/main/webapp/WEB-INF/glassfish-web.xml +++ b/src/main/webapp/WEB-INF/glassfish-web.xml @@ -1,9 +1,7 @@ - - /demo - + /ruhunuDemo diff --git a/src/main/webapp/admin/institutions/manage_routes.xhtml b/src/main/webapp/admin/institutions/manage_routes.xhtml index a398d76f00..2c76517724 100644 --- a/src/main/webapp/admin/institutions/manage_routes.xhtml +++ b/src/main/webapp/admin/institutions/manage_routes.xhtml @@ -51,6 +51,17 @@ + + + + diff --git a/src/main/webapp/admin/institutions/route.xhtml b/src/main/webapp/admin/institutions/route.xhtml index 98cbed22c5..31a8fe0469 100644 --- a/src/main/webapp/admin/institutions/route.xhtml +++ b/src/main/webapp/admin/institutions/route.xhtml @@ -12,7 +12,7 @@ - +
@@ -35,6 +35,21 @@
+
+
+ +
+
+ + +
+
@@ -43,11 +58,13 @@
+ + - + diff --git a/src/main/webapp/admin/staff/upload_staff.xhtml b/src/main/webapp/admin/staff/upload_staff.xhtml index fcada24c48..56016ed636 100644 --- a/src/main/webapp/admin/staff/upload_staff.xhtml +++ b/src/main/webapp/admin/staff/upload_staff.xhtml @@ -55,8 +55,13 @@ - + A + Code. + Staff member's Code. Optional + + + B EPF No. Staff member's EPF No. Required @@ -70,11 +75,61 @@ Name Staff member's name. Required. + + C + Full Name + Staff Full Name. Required. + D Name with initials Staff member's name with initials. Required. + + D + Address + Staff member's Address. Required. + + + Sex + sex + sex. Required. + + + Nic No + Nic No + Staff member's Nic No. Required. + + + DOB + DOB + Staff member's DOB. Required. + + + Date of Retired + Date of Retired + Date of Retired + + + Department + Department + Department + + + Branch + Branch + Branch. + + + Account No + Account No + Account No. + + + Bank + Bank + Bank. + diff --git a/src/main/webapp/admin/users/tmp.xhtml b/src/main/webapp/admin/users/tmp.xhtml index d98f7eb16d..7609d83d0a 100644 --- a/src/main/webapp/admin/users/tmp.xhtml +++ b/src/main/webapp/admin/users/tmp.xhtml @@ -7,64 +7,24 @@ xmlns:p="http://primefaces.org/ui"> - - - - - - - - - - - - - - - - - - -
- - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + diff --git a/src/main/webapp/admin/users/user_list.xhtml b/src/main/webapp/admin/users/user_list.xhtml index 04011ea14a..7b34a05763 100644 --- a/src/main/webapp/admin/users/user_list.xhtml +++ b/src/main/webapp/admin/users/user_list.xhtml @@ -69,7 +69,7 @@ - + diff --git a/src/main/webapp/admin/users/user_privileges.xhtml b/src/main/webapp/admin/users/user_privileges.xhtml index b89433caf0..bf722db383 100644 --- a/src/main/webapp/admin/users/user_privileges.xhtml +++ b/src/main/webapp/admin/users/user_privileges.xhtml @@ -12,79 +12,113 @@ - - - - - - -