Merge branch 'master' into Issue#6439

hmislk · Aug 7, 2024 · 81ecb20 · 81ecb20
2 parents cee5856 + c80d5c6
commit 81ecb20
Show file tree

Hide file tree

Showing 254 changed files with 4,446 additions and 2,328 deletions.
diff --git a/.github/counter.txt b/.github/counter.txt
@@ -1 +1 @@
-5
+2
diff --git a/.github/last_date.txt b/.github/last_date.txt
@@ -1 +1 @@
-20240803
+20240807
diff --git 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
@@ -1,22 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project-shared-configuration>
-    <!--
-This file contains additional configuration written by modules in the NetBeans IDE.
-The configuration is intended to be shared among all the users of project and
-therefore it is assumed to be part of version control checkout.
-Without this configuration present, some functionality in the IDE may be limited or fail altogether.
--->
     <libraries xmlns="http://www.netbeans.org/ns/cdnjs-libraries/1"/>
+    <configuration>
+        <deployment>
+            <deployOnSave>false</deployOnSave>
+        </deployment>
+    </configuration>
     <properties xmlns="http://www.netbeans.org/ns/maven-properties-data/1">
-        <!--
-Properties that influence various parts of the IDE, especially code formatting and the like. 
-You can copy and paste the single properties, into the pom.xml file and the IDE will pick them up.
-That way multiple projects can share the same settings (useful for formatting rules for example).
-Any value defined here will override the pom.xml file value but is only applicable to the current project.
--->
         <org-netbeans-modules-maven-jaxws.rest_2e_config_2e_type>ide</org-netbeans-modules-maven-jaxws.rest_2e_config_2e_type>
         <netbeans.compile.on.save>none</netbeans.compile.on.save>
         <org-netbeans-modules-maven-j2ee.netbeans_2e_deploy_2e_on_2e_save>false</org-netbeans-modules-maven-j2ee.netbeans_2e_deploy_2e_on_2e_save>
-        <org-netbeans-modules-maven-j2ee.netbeans_2e_hint_2e_deploy_2e_server>pfv5ee8</org-netbeans-modules-maven-j2ee.netbeans_2e_hint_2e_deploy_2e_server>
+        <org-netbeans-modules-projectapi.jsf_2e_language>Facelets</org-netbeans-modules-projectapi.jsf_2e_language>
     </properties>
 </project-shared-configuration>
diff --git 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">
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.divudi</groupId>
-    <artifactId>sethmademo</artifactId>
+    <artifactId>ruhunu</artifactId>
     <version>3.0.0</version>
     <packaging>war</packaging>
     <name>ruhunu</name>

diff --git 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
@@ -10,19 +10,14 @@
 
 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;
 import com.divudi.facade.AppointmentActivityFacade;
 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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,22 +33,19 @@
 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;
 import com.divudi.entity.Bill;
 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -10,37 +10,31 @@
 
 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;
 import com.divudi.entity.Staff;
 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;
 import java.util.Date;
 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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;