diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index e9224b582..692d923d6 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,10 +1,10 @@ #Installation and Configuration using IntelliJ IDEA ### Required downloads -1. [MySQL](http://www.mysql.com/) -2. [Play Framework](http://downloads.typesafe.com/typesafe-activator/1.2.10/typesafe-activator-1.2.10.zip) -3. [Java JDK](http://www.oracle.com/technetwork/java/javase/downloads/jdk7-downloads-1880260.html) -4. [IntelliJ IDEA](http://www.jetbrains.com/idea/) +1. [MySQL 5.6](http://www.mysql.com/) +2. [Play Framework 2.3.7](http://downloads.typesafe.com/typesafe-activator/1.2.10/typesafe-activator-1.2.10.zip) +3. [Java JDK 1.7](http://www.oracle.com/technetwork/java/javase/downloads/jdk7-downloads-1880260.html) +4. [IntelliJ IDEA 13](http://www.jetbrains.com/idea/) 5. [Git](http://git-scm.com/) ### Configuration diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 309342c78..eaea7a301 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -12,4 +12,7 @@ These people have contributed to fEMR's design and implementation: * [Priyesh Pandya](https://github.com/priyeshp) * [Danny Reinheimer](https://github.com/codeitandloadit) * [Cohen Carlisle](https://github.com/Cohen-Carlisle) -* [Brandon Dane](https://github.com/b6025) \ No newline at end of file +* [Brandon Dane](https://github.com/b6025) +* [Ken Dunlap](https://github.com/kdunlap) +* [Arslan Gondal](https://github.com/unfixed) +* [Khoa Le](https://github.com/khoal) \ No newline at end of file diff --git a/app/femr/business/helpers/DomainMapper.java b/app/femr/business/helpers/DomainMapper.java index cc0e61b19..8c06154b5 100644 --- a/app/femr/business/helpers/DomainMapper.java +++ b/app/femr/business/helpers/DomainMapper.java @@ -20,12 +20,17 @@ import com.avaje.ebean.Ebean; import com.google.inject.Inject; + import javax.inject.Provider; + import femr.common.models.*; -import femr.data.models.*; +import femr.ui.models.research.FilterViewModel; +import femr.data.models.core.*; import femr.util.calculations.dateUtils; import femr.util.stringhelpers.StringUtils; import org.joda.time.DateTime; + +import java.util.Date; import java.util.List; /** @@ -39,6 +44,10 @@ public class DomainMapper { private final Provider medicationActiveDrugProvider; private final Provider medicationMeasurementUnitProvider; private final Provider medicationFormProvider; + private final Provider missionCityProvider; + private final Provider missionCountryProvider; + private final Provider missionTeamProvider; + private final Provider missionTripProvider; private final Provider patientProvider; private final Provider patientAgeClassificationProvider; private final Provider patientEncounterPhotoProvider; @@ -46,7 +55,6 @@ public class DomainMapper { private final Provider patientEncounterTabFieldProvider; private final Provider patientEncounterVitalProvider; private final Provider patientPrescriptionProvider; - private final Provider photoProvider; private final Provider roleProvider; private final Provider tabFieldProvider; @@ -63,6 +71,10 @@ public DomainMapper(Provider chiefComplaintProvider, Provider medicationFormProvider, Provider medicationActiveDrugProvider, Provider medicationMeasurementUnitProvider, + Provider missionCityProvider, + Provider missionCountryProvider, + Provider missionTeamProvider, + Provider missionTripProvider, Provider patientProvider, Provider patientAgeClassificationProvider, Provider patientEncounterPhotoProvider, @@ -84,7 +96,11 @@ public DomainMapper(Provider chiefComplaintProvider, this.medicationActiveDrugNameProvider = medicationActiveDrugNameProvider; this.medicationFormProvider = medicationFormProvider; this.medicationActiveDrugProvider = medicationActiveDrugProvider; - this.medicationMeasurementUnitProvider = medicationMeasurementUnitProvider; + this.medicationMeasurementUnitProvider = medicationMeasurementUnitProvider; + this.missionCityProvider = missionCityProvider; + this.missionCountryProvider = missionCountryProvider; + this.missionTeamProvider = missionTeamProvider; + this.missionTripProvider = missionTripProvider; this.patientProvider = patientProvider; this.patientAgeClassificationProvider = patientAgeClassificationProvider; this.patientEncounterPhotoProvider = patientEncounterPhotoProvider; @@ -175,6 +191,107 @@ public ITabField createTabField(TabFieldItem tabFieldItem, Boolean isDeleted, IT return tabField; } + /** + * Creates a trip item + * + * @param teamName name of the team + * @param tripCity city of the trip + * @param tripCountry country of the trip + * @param startDate when the trip starts + * @param endDate when the trip ends + * @return + */ + public static TripItem createTripItem(String teamName, String tripCity, String tripCountry, Date startDate, Date endDate) { + if (StringUtils.isNullOrWhiteSpace(teamName)|| + StringUtils.isNullOrWhiteSpace(tripCity) || + StringUtils.isNullOrWhiteSpace(tripCountry) || + startDate == null){ + return null; + } + + TripItem tripItem = new TripItem(); + tripItem.setTeamName(teamName); + tripItem.setTripCity(tripCity); + tripItem.setTripCountry(tripCountry); + tripItem.setTripStartDate(startDate); + tripItem.setTripEndDate(endDate); + return tripItem; + } + + public static TeamItem createTeamItem(String name, String location, String description){ + if (StringUtils.isNullOrWhiteSpace(name)){ + return null; + } + TeamItem teamItem = new TeamItem(); + teamItem.setName(name); + teamItem.setLocation(location); + teamItem.setDescription(description); + return teamItem; + } + + public static CityItem createCityItem(String cityName, String countryName){ + if (StringUtils.isNullOrWhiteSpace(cityName) || StringUtils.isNullOrWhiteSpace(countryName)) + return null; + + CityItem cityItem = new CityItem(); + cityItem.setCityName(cityName); + cityItem.setCountryName(countryName); + return cityItem; + } + + /** + * Create a new mission trip + * + * @param startDate start date of the trip + * @param endDate end date of the trip + * @param isCurrent is this the current trip? + * @param missionCity the city where the trip is taking place + * @param missionTeam the country where the trip is taking place + * @return a brand spankin' new freakin' mission trip + */ + public IMissionTrip createMissionTrip(Date startDate, Date endDate, boolean isCurrent, IMissionCity missionCity, IMissionTeam missionTeam) { + if (startDate == null || endDate == null || missionCity == null || missionTeam == null) { + return null; + } + IMissionTrip missionTrip = missionTripProvider.get(); + missionTrip.setCurrent(isCurrent); + missionTrip.setStartDate(startDate); + missionTrip.setEndDate(endDate); + missionTrip.setMissionCity(missionCity); + missionTrip.setMissionTeam(missionTeam); + return missionTrip; + } + + public IMissionCountry createMissionCountry(String name) { + if (StringUtils.isNullOrWhiteSpace(name)) { + return null; + } + IMissionCountry missionCountry = missionCountryProvider.get(); + missionCountry.setName(name); + return missionCountry; + } + + public IMissionCity createMissionCity(String name, IMissionCountry missionCountry) { + if (StringUtils.isNullOrWhiteSpace(name) || missionCountry == null) { + return null; + } + IMissionCity missionCity = missionCityProvider.get(); + missionCity.setMissionCountry(missionCountry); + missionCity.setName(name); + return missionCity; + } + + public IMissionTeam createMissionTeam(String name, String location, String description) { + if (StringUtils.isNullOrWhiteSpace(name)) { + return null; + } + IMissionTeam missionTeam = missionTeamProvider.get(); + missionTeam.setName(name); + missionTeam.setLocation(location); + missionTeam.setDescription(description); + return missionTeam; + } + /** * Create a new TabItem (DTO) * @@ -286,7 +403,7 @@ public static MedicationItem createMedicationItem(IMedication medication) { } String fullActiveDrugName = ""; - for(IMedicationActiveDrug medicationActiveDrug : medication.getMedicationActiveDrugs()){ + for (IMedicationActiveDrug medicationActiveDrug : medication.getMedicationActiveDrugs()) { medicationItem.addActiveIngredient(medicationActiveDrug.getMedicationActiveDrugName().getName(), medicationActiveDrug.getMedicationMeasurementUnit().getName(), medicationActiveDrug.getValue(), @@ -325,7 +442,7 @@ public IMedication createMedication(MedicationItem medicationItem, List 0) { + + filterItem.setGroupPrimary(filterViewModel.isGroupPrimary()); + } else { + + filterItem.setGroupPrimary(false); + } + + filterItem.setRangeStart(filterViewModel.getRangeStart()); + filterItem.setRangeEnd(filterViewModel.getRangeEnd()); + + filterItem.setMedicationId(filterViewModel.getMedicationId()); + + return filterItem; + } } diff --git a/app/femr/business/helpers/LogicDoer.java b/app/femr/business/helpers/LogicDoer.java index 2005d4e72..58bf3539a 100644 --- a/app/femr/business/helpers/LogicDoer.java +++ b/app/femr/business/helpers/LogicDoer.java @@ -19,7 +19,7 @@ package femr.business.helpers; import com.typesafe.config.ConfigFactory; -import femr.data.models.IPatientEncounter; +import femr.data.models.core.IPatientEncounter; import femr.util.calculations.dateUtils; import org.joda.time.DateTime; diff --git a/app/femr/business/helpers/QueryHelper.java b/app/femr/business/helpers/QueryHelper.java index 49726c39a..b183eaa50 100644 --- a/app/femr/business/helpers/QueryHelper.java +++ b/app/femr/business/helpers/QueryHelper.java @@ -19,10 +19,9 @@ package femr.business.helpers; import com.avaje.ebean.Query; -import femr.common.models.VitalItem; import femr.data.daos.IRepository; -import femr.data.models.IPatientEncounterVital; -import femr.data.models.PatientEncounterVital; +import femr.data.models.core.IPatientEncounterVital; +import femr.data.models.mysql.PatientEncounterVital; import java.util.List; diff --git a/app/femr/business/helpers/QueryProvider.java b/app/femr/business/helpers/QueryProvider.java index ea4f84b93..9737d3dbc 100644 --- a/app/femr/business/helpers/QueryProvider.java +++ b/app/femr/business/helpers/QueryProvider.java @@ -21,9 +21,7 @@ import com.avaje.ebean.Ebean; import com.avaje.ebean.Query; -import femr.data.models.Role; -import femr.data.models.User; -import femr.data.models.*; +import femr.data.models.mysql.*; /** * Responsible for providing all queries @@ -50,6 +48,14 @@ public static Query getMedicationFormQuery() { return Ebean.find(MedicationForm.class); } + public static Query getMissionTripQuery() { return Ebean.find(MissionTrip.class);} + + public static Query getMissionCityQuery() { return Ebean.find(MissionCity.class);} + + public static Query getMissionCountryQuery() { return Ebean.find(MissionCountry.class);} + + public static Query getMissionTeamQuery() { return Ebean.find(MissionTeam.class);} + public static Query getPatientQuery() { return Ebean.find(Patient.class); } diff --git a/app/femr/business/services/TriageService.java b/app/femr/business/services/TriageService.java deleted file mode 100644 index 64f8ba4b9..000000000 --- a/app/femr/business/services/TriageService.java +++ /dev/null @@ -1,270 +0,0 @@ -/* - fEMR - fast Electronic Medical Records - Copyright (C) 2014 Team fEMR - - fEMR is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - fEMR is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with fEMR. If not, see . If - you have any questions, contact . -*/ -package femr.business.services; - -import com.avaje.ebean.ExpressionList; -import com.avaje.ebean.Query; -import com.google.inject.Inject; -import com.google.inject.Provider; -import femr.business.helpers.DomainMapper; -import femr.business.helpers.QueryHelper; -import femr.business.helpers.QueryProvider; -import femr.common.dto.ServiceResponse; -import femr.data.daos.IRepository; -import femr.data.models.*; -import femr.common.models.PatientEncounterItem; -import femr.common.models.PatientItem; -import femr.common.models.VitalItem; -import femr.util.calculations.dateUtils; -import femr.util.stringhelpers.StringUtils; - -import java.util.*; - -public class TriageService implements ITriageService { - - private final IRepository chiefComplaintRepository; - private final IRepository patientRepository; - private final IRepository patientAgeClassificationRepository; - private final IRepository patientEncounterRepository; - private final IRepository patientEncounterVitalRepository; - private final IRepository userRepository; - private final IRepository vitalRepository; - private final Provider patientEncounterVitalProvider; - private final DomainMapper domainMapper; - - @Inject - public TriageService(IRepository chiefComplaintRepository, - IRepository patientRepository, - IRepository patientAgeClassificationRepository, - IRepository patientEncounterRepository, - IRepository patientEncounterVitaRepository, - IRepository userRepository, - IRepository vitalRepository, - Provider patientEncounterVitalProvider, - DomainMapper domainMapper) { - this.chiefComplaintRepository = chiefComplaintRepository; - this.patientRepository = patientRepository; - this.patientAgeClassificationRepository = patientAgeClassificationRepository; - this.patientEncounterRepository = patientEncounterRepository; - this.patientEncounterVitalRepository = patientEncounterVitaRepository; - this.userRepository = userRepository; - this.vitalRepository = vitalRepository; - this.patientEncounterVitalProvider = patientEncounterVitalProvider; - this.domainMapper = domainMapper; - } - - /** - * {@inheritDoc} - */ - public ServiceResponse> findPossibleAgeClassifications() { - ServiceResponse> response = new ServiceResponse<>(); - Map patientAgeClassificationStrings = new LinkedHashMap<>(); - try { - Query patientAgeClassificationExpressionList = QueryProvider.getPatientAgeClassificationQuery() - .where() - .eq("isDeleted", false) - .order() - .asc("sortOrder"); - List patientAgeClassifications = patientAgeClassificationRepository.find(patientAgeClassificationExpressionList); - for (IPatientAgeClassification pac : patientAgeClassifications) { - patientAgeClassificationStrings.put(pac.getName(), pac.getDescription()); - } - response.setResponseObject(patientAgeClassificationStrings); - } catch (Exception ex) { - response.addError("", ex.getMessage()); - } - return response; - } - - /** - * {@inheritDoc} - */ - @Override - public ServiceResponse findPatientAndUpdateSex(int id, String sex) { - ServiceResponse response = new ServiceResponse<>(); - if (id < 1) { - response.addError("", "patient id can not be less than 1"); - return response; - } - - ExpressionList query = QueryProvider.getPatientQuery() - .where() - .eq("id", id); - - try { - IPatient savedPatient = patientRepository.findOne(query); - //if a patient doesn't have a sex and the - //user is trying to identify the patients sex - if (StringUtils.isNullOrWhiteSpace(savedPatient.getSex()) && StringUtils.isNotNullOrWhiteSpace(sex)) { - savedPatient.setSex(sex); - savedPatient = patientRepository.update(savedPatient); - } - PatientItem patientItem = domainMapper.createPatientItem(savedPatient, null, null, null, null); - response.setResponseObject(patientItem); - - } catch (Exception ex) { - response.addError("exception", ex.getMessage()); - } - - return response; - } - - /** - * {@inheritDoc} - */ - @Override - public ServiceResponse> findAllVitalItems() { - ServiceResponse> response = new ServiceResponse<>(); - - try { - List vitals = vitalRepository.findAll(Vital.class); - List vitalItems = new ArrayList<>(); - for (IVital v : vitals) { - vitalItems.add(domainMapper.createVitalItem(v)); - } - response.setResponseObject(vitalItems); - } catch (Exception ex) { - response.addError("exception", ex.getMessage()); - } - - return response; - } - - /** - * {@inheritDoc} - */ - @Override - public ServiceResponse createPatient(PatientItem patient) { - ServiceResponse response = new ServiceResponse<>(); - if (patient == null) { - response.addError("", "no patient received"); - return response; - } - - try { - IPatient newPatient = domainMapper.createPatient(patient); - newPatient = patientRepository.create(newPatient); - response.setResponseObject(DomainMapper.createPatientItem(newPatient, null, null, null, null)); - } catch (Exception ex) { - response.addError("exception", ex.getMessage()); - } - - return response; - } - - /** - * {@inheritDoc} - */ - @Override - public ServiceResponse createPatientEncounter(PatientEncounterItem patientEncounterItem) { - ServiceResponse response = new ServiceResponse<>(); - if (patientEncounterItem == null) { - response.addError("", "no patient encounter item specified"); - return response; - } - - try { - //find the nurse that checked in the patient - ExpressionList nurseQuery = QueryProvider.getUserQuery() - .where() - .eq("email", patientEncounterItem.getNurseEmailAddress()); - - IUser nurseUser = userRepository.findOne(nurseQuery); - - //find the age classification of the patient, if it exists - ExpressionList patientAgeClassificationExpressionList = QueryProvider.getPatientAgeClassificationQuery() - .where() - .eq("name", patientEncounterItem.getAgeClassification()); - IPatientAgeClassification patientAgeClassification = patientAgeClassificationRepository.findOne(patientAgeClassificationExpressionList); - Integer patientAgeClassificationId = null; - if (patientAgeClassification != null) - patientAgeClassificationId = patientAgeClassification.getId(); - - IPatientEncounter newPatientEncounter = domainMapper.createPatientEncounter(patientEncounterItem, nurseUser.getId(), patientAgeClassificationId); - newPatientEncounter = patientEncounterRepository.create(newPatientEncounter); - - List chiefComplaints = new ArrayList<>(); - for (String cc : patientEncounterItem.getChiefComplaints()) { - chiefComplaints.add(domainMapper.createChiefComplaint(cc, newPatientEncounter.getId())); - } - if (chiefComplaints.size() > 0) { - chiefComplaintRepository.createAll(chiefComplaints); - } - - - response.setResponseObject(DomainMapper.createPatientEncounterItem(newPatientEncounter)); - } catch (Exception ex) { - response.addError("exception", ex.getMessage()); - } - - return response; - } - - - /** - * {@inheritDoc} - */ - @Override - public ServiceResponse> createPatientEncounterVitalItems(Map patientEncounterVitalMap, int userId, int encounterId) { - ServiceResponse> response = new ServiceResponse<>(); - if (patientEncounterVitalMap == null || userId < 1 || encounterId < 1) { - response.addError("", "bad parameters"); - return response; - } - - List patientEncounterVitals = new ArrayList<>(); - IPatientEncounterVital patientEncounterVital; - IVital vital; - - ExpressionList query; - String currentTime = dateUtils.getCurrentDateTimeString(); - - try { - - - for (String key : patientEncounterVitalMap.keySet()) { - if (patientEncounterVitalMap.get(key) != null) { - - query = QueryProvider.getVitalQuery().where().eq("name", key); - vital = vitalRepository.findOne(query); - patientEncounterVital = patientEncounterVitalProvider.get(); - patientEncounterVital.setPatientEncounterId(encounterId); - patientEncounterVital.setUserId(userId); - patientEncounterVital.setDateTaken(currentTime); - patientEncounterVital.setVital(vital); - patientEncounterVital.setVitalValue(patientEncounterVitalMap.get(key)); - patientEncounterVitals.add(patientEncounterVital); - } - } - - List newPatientEncounterVitals = patientEncounterVitalRepository.createAll(patientEncounterVitals); - List vitalItems = new ArrayList<>(); - for (IPatientEncounterVital pev : patientEncounterVitals) { - vitalItems.add(domainMapper.createVitalItem(pev)); - } - - response.setResponseObject(vitalItems); - } catch (Exception ex) { - response.addError("exception", ex.getMessage()); - } - - return response; - } - -} diff --git a/app/femr/business/services/IConfigureService.java b/app/femr/business/services/core/IConfigureService.java similarity index 91% rename from app/femr/business/services/IConfigureService.java rename to app/femr/business/services/core/IConfigureService.java index d6fe15671..519ee0a86 100644 --- a/app/femr/business/services/IConfigureService.java +++ b/app/femr/business/services/core/IConfigureService.java @@ -16,10 +16,10 @@ along with fEMR. If not, see . If you have any questions, contact . */ -package femr.business.services; +package femr.business.services.core; -import femr.common.dto.ServiceResponse; -import femr.data.models.ISystemSetting; +import femr.common.dtos.ServiceResponse; +import femr.data.models.core.ISystemSetting; import java.util.List; diff --git a/app/femr/business/services/ISuperuserService.java b/app/femr/business/services/core/ICustomTabService.java similarity index 89% rename from app/femr/business/services/ISuperuserService.java rename to app/femr/business/services/core/ICustomTabService.java index 8fa8893c0..dd1ee3ed4 100644 --- a/app/femr/business/services/ISuperuserService.java +++ b/app/femr/business/services/core/ICustomTabService.java @@ -16,17 +16,16 @@ along with fEMR. If not, see . If you have any questions, contact . */ -package femr.business.services; +package femr.business.services.core; - -import femr.common.dto.ServiceResponse; +import femr.common.dtos.ServiceResponse; import femr.common.models.TabFieldItem; import femr.common.models.TabItem; import java.util.List; +import java.util.Map; -public interface ISuperuserService { - +public interface ICustomTabService { /** * Edit a tab field * @@ -96,7 +95,7 @@ public interface ISuperuserService { * @param isDeleted whether or not the fields are deleted * @return a list of fields for the tab with possible exceptions */ - ServiceResponse> getTabFields(String tabName, Boolean isDeleted); + ServiceResponse> getTabFieldsByTabName(String tabName, Boolean isDeleted); /** * Get all possible types of tab fields @@ -128,4 +127,11 @@ public interface ISuperuserService { */ ServiceResponse doesTabExist(String tabName); + /** + * Maps a list of TabFieldItems to their respective tab + * + * @param encounterId current encounter id + * @return TabFieldItems mapped to their respective tab + */ + ServiceResponse>> getTabFields(int encounterId); } diff --git a/app/femr/business/services/IMedicalService.java b/app/femr/business/services/core/IEncounterService.java similarity index 56% rename from app/femr/business/services/IMedicalService.java rename to app/femr/business/services/core/IEncounterService.java index e1d5b72cb..0f6d58285 100644 --- a/app/femr/business/services/IMedicalService.java +++ b/app/femr/business/services/core/IEncounterService.java @@ -16,63 +16,53 @@ along with fEMR. If not, see . If you have any questions, contact . */ -package femr.business.services; +package femr.business.services.core; -import femr.common.dto.ServiceResponse; -import femr.common.models.*; -import femr.data.models.IUser; +import femr.common.dtos.ServiceResponse; +import femr.common.models.PatientEncounterItem; +import femr.common.models.ProblemItem; +import femr.common.models.TabFieldItem; +import femr.common.models.UserItem; +import femr.data.models.core.IPatientEncounter; import java.util.List; import java.util.Map; -public interface IMedicalService { +public interface IEncounterService { /** - * Creates all patient encounter vitals + * Create a patient encounter * - * @param patientEncounterVital list of vitals for saving - * @param userId id of the user saving the vitals - * @param encounterId id of the current encounter - * @return vitals that were saved + * @param patientEncounterItem the patient encounter + * @return the patient encounter with id (pk) */ - ServiceResponse> createPatientEncounterVitals(Map patientEncounterVital, int userId, int encounterId); + ServiceResponse createPatientEncounter(PatientEncounterItem patientEncounterItem); /** - * Gets the physician that saw a patient in medical. + * Checks a patient into medical (updates date_of_medical_visit and the user checking them in) * - * @param encounterId id of the encounter to check - * @return the physician or null + * @param encounterId current encounter id + * @param userId id of the physician + * @return updated patient encounter */ - ServiceResponse getPhysicianThatCheckedInPatient(int encounterId); + ServiceResponse checkPatientInToMedical(int encounterId, int userId); /** - * creates multiple prescriptions + * Checks a patient into pharmacy (updates date_of_pharmacy_visit and identifies the user) * - * @param prescriptionItems list of prescription items - * @param userId id of the user saving the prescriptions - * @param encounterId id of the current encounter - * @return updated prescription list + * @param encounterId current encounter + * @param userId id of the pharmacist + * @return updated patient encounter */ - ServiceResponse> createPatientPrescriptions(List prescriptionItems, int userId, int encounterId, boolean isDispensed); + ServiceResponse checkPatientInToPharmacy(int encounterId, int userId); /** - * Adds tab field items to the PatientEncounterTabField table - * - * @param tabFieldItems list of fields to be saved - * @param encounterId id of the current encounter - * @param userId id of the user saving the fields - * @return updated list of items - */ - ServiceResponse> createPatientEncounterTabFields(List tabFieldItems, int encounterId, int userId); - - /** - * Checks a patient into medical (updates date_of_medical_visit and the user checking them in) + * Gets the physician that saw a patient in medical. * - * @param encounterId current encounter id - * @param userId id of the physician - * @return updated patient encounter + * @param encounterId id of the encounter to check + * @return the physician or null */ - ServiceResponse checkPatientIn(int encounterId, int userId); + ServiceResponse getPhysicianThatCheckedInPatientToMedical(int encounterId); /** * Finds non-custom current field values for medical tabs @@ -83,17 +73,21 @@ public interface IMedicalService { ServiceResponse> findCurrentTabFieldsByEncounterId(int encounterId); /** - * Gets all available custom tabs for the medical page + * Adds tab field items to the PatientEncounterTabField table * - * @return list of tabs + * @param tabFieldItems list of fields to be saved + * @param encounterId id of the current encounter + * @param userId id of the user saving the fields + * @return updated list of items */ - ServiceResponse> getCustomTabs(); + ServiceResponse> createPatientEncounterTabFields(List tabFieldItems, int encounterId, int userId); /** - * Matches a list of TabFieldItems to their respective tab + * Find all problems * - * @param encounterId current encounter id - * @return TabFieldItems mapped to their respective tab + * @param encounterId id of the encounter + * @return list of problems */ - ServiceResponse>> getCustomFields(int encounterId); + ServiceResponse> findProblemItems(int encounterId); + } diff --git a/app/femr/business/services/IInventoryService.java b/app/femr/business/services/core/IInventoryService.java similarity index 95% rename from app/femr/business/services/IInventoryService.java rename to app/femr/business/services/core/IInventoryService.java index 6dc2930ab..f967d2ca3 100644 --- a/app/femr/business/services/IInventoryService.java +++ b/app/femr/business/services/core/IInventoryService.java @@ -16,9 +16,9 @@ along with fEMR. If not, see . If you have any questions, contact . */ -package femr.business.services; +package femr.business.services.core; -import femr.common.dto.ServiceResponse; +import femr.common.dtos.ServiceResponse; import femr.common.models.MedicationItem; import java.util.List; diff --git a/app/femr/business/services/IPharmacyService.java b/app/femr/business/services/core/IMedicationService.java similarity index 72% rename from app/femr/business/services/IPharmacyService.java rename to app/femr/business/services/core/IMedicationService.java index 7dd636e0a..195602a7f 100644 --- a/app/femr/business/services/IPharmacyService.java +++ b/app/femr/business/services/core/IMedicationService.java @@ -16,51 +16,39 @@ along with fEMR. If not, see . If you have any questions, contact . */ -package femr.business.services; +package femr.business.services.core; +import femr.common.dtos.ServiceResponse; import femr.common.models.PrescriptionItem; -import femr.common.dto.ServiceResponse; -import femr.common.models.ProblemItem; -import femr.common.models.VitalItem; -import femr.data.models.IPatientEncounter; import java.util.List; -public interface IPharmacyService { - +public interface IMedicationService { /** - * Checks a patient into pharmacy (updates date_of_pharmacy_visit and identifies the user) + * Get a JSON string representing medication names * - * @param encounterId current encounter - * @param userId id of the pharmacist - * @return updated patient encounter + * @return JSON object in the form of { medication# : "name" } */ - ServiceResponse checkPatientIn(int encounterId, int userId); + ServiceResponse getMedicationNames(); /** * Create a new prescription and replace an old one with it * * @param prescriptionItem new prescription to replace the old one * @param oldScriptId id of the old prescription that is being replaced - * @param isCounseled was the patient counseled on this prescription * @return updated new prescription */ ServiceResponse createAndReplacePrescription(PrescriptionItem prescriptionItem, int oldScriptId, int userId, boolean isCounseled); /** - * Find all problems - * - * @param encounterId id of the encounter - * @return list of problems - */ - ServiceResponse> findProblemItems(int encounterId); - - /** - * Retrieve all medication names for typeahead + * creates multiple prescriptions * - * @return + * @param prescriptionItems list of prescription items + * @param userId id of the user saving the prescriptions + * @param encounterId id of the current encounter + * @return updated prescription list */ - ServiceResponse> findAllMedications(); + ServiceResponse> createPatientPrescriptions(List prescriptionItems, int userId, int encounterId, boolean isDispensed, boolean isCounseled); /** * Mark prescriptions as filled @@ -77,4 +65,11 @@ public interface IPharmacyService { * @return prescription items that were marked as counseled */ ServiceResponse> markPrescriptionsAsCounseled(List prescriptionIds); + + /** + * Retrieve all medication names for typeahead + * + * @return + */ + ServiceResponse> findAllMedications(); } diff --git a/app/femr/business/services/core/IMissionTripService.java b/app/femr/business/services/core/IMissionTripService.java new file mode 100644 index 000000000..9c9582159 --- /dev/null +++ b/app/femr/business/services/core/IMissionTripService.java @@ -0,0 +1,93 @@ +/* + fEMR - fast Electronic Medical Records + Copyright (C) 2014 Team fEMR + + fEMR is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + fEMR is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with fEMR. If not, see . If + you have any questions, contact . +*/ +package femr.business.services.core; + +import femr.common.dtos.ServiceResponse; +import femr.common.models.CityItem; +import femr.common.models.MissionItem; +import femr.common.models.TeamItem; +import femr.common.models.TripItem; +import femr.data.models.core.IMissionTrip; + +import java.util.List; + +public interface IMissionTripService { + /** + * Retrieve the current trip information + * @return the current trip or an error if one doesn't exist + */ + IMissionTrip findCurrentMissionTrip(); + + /** + * Retrieve a list of the teams that are already in the database + * @return a list of team names + */ + ServiceResponse> findAvailableTeams(); + + /** + * Retrieve a list of the cities that are already in the database + * @return a list of cities with respective country + */ + ServiceResponse> findAvailableCities(); + + /** + * Retrieve a list of the countries that are already in the database + * @return a list of countries + */ + ServiceResponse> findAvailableCountries(); + + /** + * Get all available team and trip information + * + * @return all mission teams with their respective trips + */ + ServiceResponse> findAllTripInformation(); + + /** + * Create a new team + * + * @param teamItem the name is required + * @return + */ + ServiceResponse createNewTeam(TeamItem teamItem); + + /** + * Create a new trip + * + * @param tripItem everything except end date required + * @return + */ + ServiceResponse createNewTrip(TripItem tripItem); + + /** + * Create a new city + * @param cityName name of the city + * @param countryName name of the country + * @return name of the created city + */ + ServiceResponse createNewCity(String cityName, String countryName); + + /** + * Mark a trip as current and all others as not current + * + * @param tripId the id of the trip to mark current + * @return the current trip + */ + ServiceResponse updateCurrentTrip(int tripId); +} diff --git a/app/femr/business/services/ITriageService.java b/app/femr/business/services/core/IPatientService.java similarity index 55% rename from app/femr/business/services/ITriageService.java rename to app/femr/business/services/core/IPatientService.java index 37ddb3f2e..17d028de3 100644 --- a/app/femr/business/services/ITriageService.java +++ b/app/femr/business/services/core/IPatientService.java @@ -16,21 +16,15 @@ along with fEMR. If not, see . If you have any questions, contact . */ -package femr.business.services; +package femr.business.services.core; -import femr.common.dto.ServiceResponse; -import femr.common.models.PatientEncounterItem; +import femr.common.dtos.ServiceResponse; import femr.common.models.PatientItem; -import femr.common.models.VitalItem; -import java.util.List; import java.util.Map; -/** - * Interface for Triage Service. Contains the documentation which - * is inherited in the implementations. - */ -public interface ITriageService { +public interface IPatientService { + /** * Finds all possible age classifications for a patient */ @@ -45,35 +39,10 @@ public interface ITriageService { */ ServiceResponse findPatientAndUpdateSex(int id, String sex); - /** - * Gets vital items, but only the names - * - * @return Returns a list of all vitals without values - */ - ServiceResponse> findAllVitalItems(); - /** * Creates a new patient * @param patient patient to be created * @return patient with an assigned Id (pk) */ ServiceResponse createPatient(PatientItem patient); - - /** - * Create a patient encounter - * - * @param patientEncounterItem the patient encounter - * @return the patient encounter with id (pk) - */ - ServiceResponse createPatientEncounter(PatientEncounterItem patientEncounterItem); - - /** - * Create all vitals for an encounter - * - * @param patientEncounterVitalMap A keypair of vitals to be created - * @param userId User creating the vitals - * @param encounterId Encounter that the vitals are for - * @return List of vitals that were created - */ - ServiceResponse> createPatientEncounterVitalItems(Map patientEncounterVitalMap, int userId, int encounterId); } diff --git a/app/femr/business/services/IPhotoService.java b/app/femr/business/services/core/IPhotoService.java similarity index 96% rename from app/femr/business/services/IPhotoService.java rename to app/femr/business/services/core/IPhotoService.java index 7bf96d02c..ee6f819ee 100644 --- a/app/femr/business/services/IPhotoService.java +++ b/app/femr/business/services/core/IPhotoService.java @@ -16,11 +16,11 @@ along with fEMR. If not, see . If you have any questions, contact . */ -package femr.business.services; +package femr.business.services.core; import java.util.List; import femr.common.models.PatientEncounterItem; -import femr.common.dto.ServiceResponse; +import femr.common.dtos.ServiceResponse; import femr.common.models.PhotoItem; import femr.ui.models.medical.EditViewModelPost; import play.mvc.Http.MultipartFormData.FilePart; diff --git a/app/femr/business/services/core/IResearchService.java b/app/femr/business/services/core/IResearchService.java new file mode 100644 index 000000000..d71cb1192 --- /dev/null +++ b/app/femr/business/services/core/IResearchService.java @@ -0,0 +1,34 @@ +/* + fEMR - fast Electronic Medical Records + Copyright (C) 2014 Team fEMR + + fEMR is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + fEMR is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with fEMR. If not, see . If + you have any questions, contact . +*/ +package femr.business.services.core; + +import femr.common.dtos.ServiceResponse; +import femr.common.models.*; +import femr.ui.models.research.json.ResearchGraphDataItem; + +import java.util.Map; + +/** + * Interface for the Research Service + */ +public interface IResearchService { + + public ServiceResponse> getAllMedications(); + public ServiceResponse getGraphData(ResearchFilterItem filterItem); +} diff --git a/app/femr/business/services/IRoleService.java b/app/femr/business/services/core/IRoleService.java similarity index 89% rename from app/femr/business/services/IRoleService.java rename to app/femr/business/services/core/IRoleService.java index 5e876fa55..c91c345a1 100644 --- a/app/femr/business/services/IRoleService.java +++ b/app/femr/business/services/core/IRoleService.java @@ -16,10 +16,10 @@ along with fEMR. If not, see . If you have any questions, contact . */ -package femr.business.services; +package femr.business.services.core; -import femr.common.dto.ServiceResponse; -import femr.data.models.IRole; +import femr.common.dtos.ServiceResponse; +import femr.data.models.core.IRole; import java.util.List; diff --git a/app/femr/business/services/ISearchService.java b/app/femr/business/services/core/ISearchService.java similarity index 90% rename from app/femr/business/services/ISearchService.java rename to app/femr/business/services/core/ISearchService.java index a90f299f4..b3fb316dc 100644 --- a/app/femr/business/services/ISearchService.java +++ b/app/femr/business/services/core/ISearchService.java @@ -16,11 +16,10 @@ along with fEMR. If not, see . If you have any questions, contact . */ -package femr.business.services; +package femr.business.services.core; -import femr.common.dto.ServiceResponse; +import femr.common.dtos.ServiceResponse; import femr.common.models.*; -import femr.data.models.*; import femr.util.DataStructure.Mapping.TabFieldMultiMap; import femr.util.DataStructure.Mapping.VitalMultiMap; @@ -130,4 +129,18 @@ public interface ISearchService { * @return list of their names */ ServiceResponse> getCustomFieldList(); + + /** + * Get all patient information for searching users. + * + * @return patient item for json serialization + */ + ServiceResponse> findPatientsForSearch(); + + /** + * Get all diagnosis for help on problem input fields in medical + * + * @return ALL STRINGS, BABY + */ + ServiceResponse> findDiagnosisForSearch(); } diff --git a/app/femr/business/services/ISessionService.java b/app/femr/business/services/core/ISessionService.java similarity index 89% rename from app/femr/business/services/ISessionService.java rename to app/femr/business/services/core/ISessionService.java index c69e75403..cf4f09f48 100644 --- a/app/femr/business/services/ISessionService.java +++ b/app/femr/business/services/core/ISessionService.java @@ -16,10 +16,10 @@ along with fEMR. If not, see . If you have any questions, contact . */ -package femr.business.services; +package femr.business.services.core; -import femr.common.dto.CurrentUser; -import femr.common.dto.ServiceResponse; +import femr.common.dtos.CurrentUser; +import femr.common.dtos.ServiceResponse; public interface ISessionService { ServiceResponse createSession(String email, String password); diff --git a/app/femr/business/services/IUserService.java b/app/femr/business/services/core/IUserService.java similarity index 93% rename from app/femr/business/services/IUserService.java rename to app/femr/business/services/core/IUserService.java index 0396cafc1..67f4606d9 100644 --- a/app/femr/business/services/IUserService.java +++ b/app/femr/business/services/core/IUserService.java @@ -16,12 +16,12 @@ along with fEMR. If not, see . If you have any questions, contact . */ -package femr.business.services; +package femr.business.services.core; -import femr.common.dto.ServiceResponse; +import femr.common.dtos.ServiceResponse; import femr.common.models.UserItem; -import femr.data.models.IRole; -import femr.data.models.IUser; +import femr.data.models.core.IRole; +import femr.data.models.core.IUser; import java.util.List; diff --git a/app/femr/business/services/core/IVitalService.java b/app/femr/business/services/core/IVitalService.java new file mode 100644 index 000000000..ae503e08d --- /dev/null +++ b/app/femr/business/services/core/IVitalService.java @@ -0,0 +1,55 @@ +/* + fEMR - fast Electronic Medical Records + Copyright (C) 2014 Team fEMR + + fEMR is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + fEMR is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with fEMR. If not, see . If + you have any questions, contact . +*/ +package femr.business.services.core; + +import femr.common.dtos.ServiceResponse; +import femr.common.models.VitalItem; + +import java.util.List; +import java.util.Map; + +public interface IVitalService { + + /** + * Creates all patient encounter vitals + * + * @param patientEncounterVital list of vitals for saving + * @param userId id of the user saving the vitals + * @param encounterId id of the current encounter + * @return vitals that were saved + */ + ServiceResponse> createPatientEncounterVitals(Map patientEncounterVital, int userId, int encounterId); + + /** + * Gets vital items, but only the names + * + * @return Returns a list of all vitals without values + */ + ServiceResponse> findAllVitalItems(); + + /** + * Create all vitals for an encounter + * + * @param patientEncounterVitalMap A keypair of vitals to be created + * @param userId User creating the vitals + * @param encounterId Encounter that the vitals are for + * @return List of vitals that were created + */ + ServiceResponse> createPatientEncounterVitalItems(Map patientEncounterVitalMap, int userId, int encounterId); +} diff --git a/app/femr/business/services/ConfigureService.java b/app/femr/business/services/system/ConfigureService.java similarity index 91% rename from app/femr/business/services/ConfigureService.java rename to app/femr/business/services/system/ConfigureService.java index d216cfff0..59b60af52 100644 --- a/app/femr/business/services/ConfigureService.java +++ b/app/femr/business/services/system/ConfigureService.java @@ -16,15 +16,14 @@ along with fEMR. If not, see . If you have any questions, contact . */ -package femr.business.services; +package femr.business.services.system; -import com.avaje.ebean.ExpressionList; import com.google.inject.Inject; -import femr.business.helpers.QueryProvider; -import femr.common.dto.ServiceResponse; +import femr.business.services.core.IConfigureService; +import femr.common.dtos.ServiceResponse; import femr.data.daos.IRepository; -import femr.data.models.ISystemSetting; -import femr.data.models.SystemSetting; +import femr.data.models.core.ISystemSetting; +import femr.data.models.mysql.SystemSetting; import java.util.List; diff --git a/app/femr/business/services/SuperuserService.java b/app/femr/business/services/system/CustomTabService.java similarity index 80% rename from app/femr/business/services/SuperuserService.java rename to app/femr/business/services/system/CustomTabService.java index 6ae29bad8..0aa2bb387 100644 --- a/app/femr/business/services/SuperuserService.java +++ b/app/femr/business/services/system/CustomTabService.java @@ -16,32 +16,32 @@ along with fEMR. If not, see . If you have any questions, contact . */ -package femr.business.services; +package femr.business.services.system; import com.avaje.ebean.ExpressionList; import com.avaje.ebean.Query; import com.google.inject.Inject; import femr.business.helpers.DomainMapper; import femr.business.helpers.QueryProvider; -import femr.common.dto.ServiceResponse; +import femr.business.services.core.ICustomTabService; +import femr.common.dtos.ServiceResponse; import femr.common.models.TabFieldItem; import femr.common.models.TabItem; -import femr.data.models.ITab; -import femr.data.models.ITabField; -import femr.data.models.ITabFieldSize; -import femr.data.models.ITabFieldType; import femr.data.daos.IRepository; -import femr.data.models.Tab; -import femr.data.models.TabField; -import femr.data.models.TabFieldSize; -import femr.data.models.TabFieldType; +import femr.data.models.core.*; +import femr.data.models.mysql.*; import femr.util.stringhelpers.StringUtils; import org.joda.time.DateTime; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; -public class SuperuserService implements ISuperuserService { +public class CustomTabService implements ICustomTabService { + + private final IRepository chiefComplaintRepository; + private final IRepository patientEncounterTabFieldRepository; private final IRepository tabRepository; private final IRepository tabFieldRepository; private final IRepository tabFieldTypeRepository; @@ -49,11 +49,15 @@ public class SuperuserService implements ISuperuserService { private final DomainMapper domainMapper; @Inject - public SuperuserService(IRepository tabRepository, + public CustomTabService(IRepository chiefComplaintRepository, + IRepository patientEncounterTabFieldRepository, + IRepository tabRepository, IRepository tabFieldRepository, IRepository tabFieldTypeRepository, IRepository tabFieldSizeRepository, DomainMapper domainMapper) { + this.chiefComplaintRepository = chiefComplaintRepository; + this.patientEncounterTabFieldRepository = patientEncounterTabFieldRepository; this.tabRepository = tabRepository; this.tabFieldRepository = tabFieldRepository; this.tabFieldTypeRepository = tabFieldTypeRepository; @@ -90,7 +94,7 @@ public ServiceResponse toggleTab(String name) { return response; } - TabItem tabItem = domainMapper.createTabItem(tab); + TabItem tabItem = DomainMapper.createTabItem(tab); response.setResponseObject(tabItem); return response; } @@ -154,7 +158,7 @@ public ServiceResponse> getCustomTabs(Boolean isDeleted) { List tabItems = new ArrayList<>(); for (ITab t : tabs) { - tabItems.add(domainMapper.createTabItem(t)); + tabItems.add(DomainMapper.createTabItem(t)); } response.setResponseObject(tabItems); @@ -165,7 +169,7 @@ public ServiceResponse> getCustomTabs(Boolean isDeleted) { * {@inheritDoc} */ @Override - public ServiceResponse> getTabFields(String tabName, Boolean isDeleted) { + public ServiceResponse> getTabFieldsByTabName(String tabName, Boolean isDeleted) { ServiceResponse> response = new ServiceResponse<>(); if (StringUtils.isNullOrWhiteSpace(tabName)) { response.addError("", "bad parameters, wtf are you doing?"); @@ -183,7 +187,7 @@ public ServiceResponse> getTabFields(String tabName, Boolean List tabFields = tabFieldRepository.find(query); List customFieldItems = new ArrayList<>(); for (ITabField tf : tabFields) { - customFieldItems.add(domainMapper.createTabFieldItem(tf)); + customFieldItems.add(DomainMapper.createTabFieldItem(tf)); } response.setResponseObject(customFieldItems); } catch (Exception ex) { @@ -193,6 +197,64 @@ public ServiceResponse> getTabFields(String tabName, Boolean return response; } + /** + * {@inheritDoc} + */ + @Override + public ServiceResponse>> getTabFields(int encounterId) { + ServiceResponse>> response = new ServiceResponse<>(); + if (encounterId < 1) { + response.addError("", "encounterId must be greater than 0"); + return response; + } + Map> customFieldMap = new HashMap<>(); + ExpressionList query = QueryProvider.getTabQuery() + .where() + .eq("isDeleted", false); + try { + //O(n^2) because who gives a fuck + List customTabs = tabRepository.find(query); + for (ITab ct : customTabs) { + Query query2 = QueryProvider.getTabFieldQuery() + .fetch("tab") + .where() + .eq("isDeleted", false) + .eq("tab.name", ct.getName()) + .order() + .asc("sort_order"); + + + List customFields = tabFieldRepository.find(query2); + List customFieldItems = new ArrayList<>(); + for (ITabField cf : customFields) { + Query query3 = QueryProvider.getPatientEncounterTabFieldQuery() + .where() + .eq("tabField", cf)//somethings fucky + .eq("patient_encounter_id", encounterId) + .order() + .desc("date_taken"); + + List patientEncounterCustomField = patientEncounterTabFieldRepository.find(query3); + if (patientEncounterCustomField != null && patientEncounterCustomField.size() > 0) { + customFieldItems.add(DomainMapper.createTabFieldItem(patientEncounterCustomField.get(0))); + } else { + customFieldItems.add(DomainMapper.createTabFieldItem(cf)); + } + + + } + customFieldMap.put(ct.getName(), customFieldItems); + + } + response.setResponseObject(customFieldMap); + } catch (Exception ex) { + response.addError("", "error"); + return response; + } + + return response; + } + /** * {@inheritDoc} */ @@ -418,20 +480,20 @@ public ServiceResponse> getSizes() { * {@inheritDoc} */ @Override - public ServiceResponse doesTabFieldExist(String fieldName){ + public ServiceResponse doesTabFieldExist(String fieldName) { ServiceResponse response = new ServiceResponse<>(); ExpressionList query = QueryProvider.getTabFieldQuery() .where() .eq("name", fieldName); - try{ + try { ITabField customField = tabFieldRepository.findOne(query); - if (customField == null){ + if (customField == null) { response.setResponseObject(false); - }else{ + } else { response.setResponseObject(true); } - }catch (Exception ex){ + } catch (Exception ex) { response.setResponseObject(false); } return response; @@ -441,22 +503,21 @@ public ServiceResponse doesTabFieldExist(String fieldName){ * {@inheritDoc} */ @Override - public ServiceResponse doesTabExist(String tabName){ + public ServiceResponse doesTabExist(String tabName) { ServiceResponse response = new ServiceResponse<>(); ExpressionList query = QueryProvider.getTabQuery() .where() .eq("name", tabName); - try{ + try { ITab customTab = tabRepository.findOne(query); - if (customTab == null){ + if (customTab == null) { response.setResponseObject(false); - }else{ + } else { response.setResponseObject(true); } - }catch(Exception ex){ + } catch (Exception ex) { response.setResponseObject(false); } return response; } - } diff --git a/app/femr/business/services/MedicalService.java b/app/femr/business/services/system/EncounterService.java similarity index 58% rename from app/femr/business/services/MedicalService.java rename to app/femr/business/services/system/EncounterService.java index d5c42f8f0..5411f9791 100644 --- a/app/femr/business/services/MedicalService.java +++ b/app/femr/business/services/system/EncounterService.java @@ -16,62 +16,60 @@ along with fEMR. If not, see . If you have any questions, contact . */ -package femr.business.services; +package femr.business.services.system; import com.avaje.ebean.ExpressionList; import com.avaje.ebean.Query; import com.google.inject.Inject; -import com.google.inject.Provider; import femr.business.helpers.DomainMapper; import femr.business.helpers.QueryProvider; -import femr.common.dto.ServiceResponse; -import femr.common.models.*; +import femr.business.services.core.IEncounterService; +import femr.business.services.core.IMissionTripService; +import femr.business.services.core.IUserService; +import femr.common.dtos.ServiceResponse; +import femr.common.models.PatientEncounterItem; +import femr.common.models.ProblemItem; +import femr.common.models.TabFieldItem; +import femr.common.models.UserItem; import femr.data.daos.IRepository; -import femr.data.models.*; -import femr.util.calculations.dateUtils; +import femr.data.models.core.*; +import femr.data.models.mysql.*; import femr.util.stringhelpers.StringUtils; import org.joda.time.DateTime; -import java.util.*; +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; -public class MedicalService implements IMedicalService { +public class EncounterService implements IEncounterService { + private IMissionTripService missionTripService; private final IRepository chiefComplaintRepository; + private final IRepository patientAgeClassificationRepository; private final IRepository patientEncounterRepository; - private final IRepository patientEncounterVitalRepository; private final IRepository patientEncounterTabFieldRepository; - private final Provider patientEncounterVitalProvider; - private final IRepository patientPrescriptionRepository; - private final IRepository customTabRepository; private final IRepository tabFieldRepository; private final IRepository userRepository; - private final IRepository vitalRepository; - private final DomainMapper domainMapper; @Inject - public MedicalService(IRepository chiefComplaintRepository, - IRepository patientEncounterRepository, - IRepository patientEncounterVitalRepository, - IRepository tabFieldRepository, - IRepository patientEncounterTabFieldRepository, - IRepository patientPrescriptionRepository, - IRepository vitalRepository, - IRepository customTabRepository, - IRepository userRepository, - Provider patientEncounterVitalProvider, - DomainMapper domainMapper) { - + public EncounterService(IMissionTripService missionTripService, + IRepository chiefComplaintRepository, + IRepository patientAgeClassificationRepository, + IRepository patientEncounterRepository, + IRepository patientEncounterTabFieldRepository, + IRepository tabFieldRepository, + IRepository userRepository, + DomainMapper domainMapper){ + + this.missionTripService = missionTripService; this.chiefComplaintRepository = chiefComplaintRepository; + this.patientAgeClassificationRepository = patientAgeClassificationRepository; this.patientEncounterRepository = patientEncounterRepository; - this.patientEncounterVitalRepository = patientEncounterVitalRepository; - this.tabFieldRepository = tabFieldRepository; this.patientEncounterTabFieldRepository = patientEncounterTabFieldRepository; - this.patientPrescriptionRepository = patientPrescriptionRepository; - this.vitalRepository = vitalRepository; - this.customTabRepository = customTabRepository; + this.tabFieldRepository = tabFieldRepository; this.userRepository = userRepository; - this.patientEncounterVitalProvider = patientEncounterVitalProvider; this.domainMapper = domainMapper; } @@ -79,26 +77,53 @@ public MedicalService(IRepository chiefComplaintRepository, * {@inheritDoc} */ @Override - public ServiceResponse getPhysicianThatCheckedInPatient(int encounterId) { - ServiceResponse response = new ServiceResponse<>(); - if (encounterId < 1) { - response.addError("", "encounter id must be greater than 0"); + public ServiceResponse createPatientEncounter(PatientEncounterItem patientEncounterItem) { + ServiceResponse response = new ServiceResponse<>(); + if (patientEncounterItem == null) { + response.addError("", "no patient encounter item specified"); return response; } + try { - ExpressionList patientEncounterQuery = QueryProvider.getPatientEncounterQuery() + //find the nurse that checked in the patient + ExpressionList nurseQuery = QueryProvider.getUserQuery() .where() - .eq("id", encounterId); - IPatientEncounter patientEncounter = patientEncounterRepository.findOne(patientEncounterQuery); - if (patientEncounter.getDoctor() == null) { - response.setResponseObject(null); - } else { - UserItem userItem = DomainMapper.createUserItem(patientEncounter.getDoctor()); - response.setResponseObject(userItem); + .eq("email", patientEncounterItem.getNurseEmailAddress()); + + IUser nurseUser = userRepository.findOne(nurseQuery); + + //find the age classification of the patient, if it exists + ExpressionList patientAgeClassificationExpressionList = QueryProvider.getPatientAgeClassificationQuery() + .where() + .eq("name", patientEncounterItem.getAgeClassification()); + IPatientAgeClassification patientAgeClassification = patientAgeClassificationRepository.findOne(patientAgeClassificationExpressionList); + Integer patientAgeClassificationId = null; + if (patientAgeClassification != null) + patientAgeClassificationId = patientAgeClassification.getId(); + + //find the current trip, if one exists + IMissionTrip missionTrip = missionTripService.findCurrentMissionTrip(); + Integer missionTripId = null; + if (missionTrip != null) + missionTripId = missionTrip.getId(); + + IPatientEncounter newPatientEncounter = domainMapper.createPatientEncounter(patientEncounterItem, nurseUser.getId(), patientAgeClassificationId, missionTripId); + newPatientEncounter = patientEncounterRepository.create(newPatientEncounter); + + List chiefComplaints = new ArrayList<>(); + for (String cc : patientEncounterItem.getChiefComplaints()) { + chiefComplaints.add(domainMapper.createChiefComplaint(cc, newPatientEncounter.getId())); + } + if (chiefComplaints.size() > 0) { + chiefComplaintRepository.createAll(chiefComplaints); } + + + response.setResponseObject(DomainMapper.createPatientEncounterItem(newPatientEncounter)); } catch (Exception ex) { - response.addError("", "error finding encounter"); + response.addError("exception", ex.getMessage()); } + return response; } @@ -106,26 +131,59 @@ public ServiceResponse getPhysicianThatCheckedInPatient(int encounterI * {@inheritDoc} */ @Override - public ServiceResponse> createPatientPrescriptions(List prescriptionItems, int userId, int encounterId, boolean isDispensed) { - ServiceResponse> response = new ServiceResponse<>(); - if (prescriptionItems == null || userId < 1 || encounterId < 1) { - response.addError("", "invalid parameters"); + public ServiceResponse checkPatientInToMedical(int encounterId, int userId) { + ServiceResponse response = new ServiceResponse<>(); + if (encounterId < 1) { + response.addError("", "encounterId must be greater than 0"); return response; } - List patientPrescriptions = new ArrayList<>(); - for (PrescriptionItem pi : prescriptionItems) { - IMedication medication = domainMapper.createMedication(pi.getName()); - patientPrescriptions.add(domainMapper.createPatientPrescription(0, medication, userId, encounterId, null, false, false)); + ExpressionList query = QueryProvider.getPatientEncounterQuery() + .where() + .eq("id", encounterId); + + try { + IPatientEncounter patientEncounter = patientEncounterRepository.findOne(query); + patientEncounter.setDateOfMedicalVisit(DateTime.now()); + ExpressionList getUserQuery = QueryProvider.getUserQuery() + .where() + .eq("id", userId); + IUser user = userRepository.findOne(getUserQuery); + patientEncounter.setDoctor(user); + + patientEncounter = patientEncounterRepository.update(patientEncounter); + + + response.setResponseObject(DomainMapper.createPatientEncounterItem(patientEncounter)); + } catch (Exception ex) { + response.addError("exception", ex.getMessage()); + } + + return response; + } + + /** + * {@inheritDoc} + */ + @Override + public ServiceResponse checkPatientInToPharmacy(int encounterId, int userId) { + ServiceResponse response = new ServiceResponse<>(); + if (encounterId < 1) { + response.addError("", "encounterId can not be less than 1"); + return response; } try { - List newPatientPrescriptions = patientPrescriptionRepository.createAll(patientPrescriptions); - List newPrescriptionItems = new ArrayList<>(); - for (IPatientPrescription pp : newPatientPrescriptions) { - newPrescriptionItems.add(domainMapper.createPatientPrescriptionItem(pp)); - } - response.setResponseObject(newPrescriptionItems); + ExpressionList query = QueryProvider.getPatientEncounterQuery().where().eq("id", encounterId); + IPatientEncounter patientEncounter = patientEncounterRepository.findOne(query); + patientEncounter.setDateOfPharmacyVisit(DateTime.now()); + ExpressionList getUserQuery = QueryProvider.getUserQuery() + .where() + .eq("id", userId); + IUser user = userRepository.findOne(getUserQuery); + patientEncounter.setPharmacist(user); + patientEncounter = patientEncounterRepository.update(patientEncounter); + response.setResponseObject(patientEncounter); } catch (Exception ex) { response.addError("exception", ex.getMessage()); } @@ -133,6 +191,33 @@ public ServiceResponse> createPatientPrescriptions(List

getPhysicianThatCheckedInPatientToMedical(int encounterId) { + ServiceResponse response = new ServiceResponse<>(); + if (encounterId < 1) { + response.addError("", "encounter id must be greater than 0"); + return response; + } + try { + ExpressionList patientEncounterQuery = QueryProvider.getPatientEncounterQuery() + .where() + .eq("id", encounterId); + IPatientEncounter patientEncounter = patientEncounterRepository.findOne(patientEncounterQuery); + if (patientEncounter.getDoctor() == null) { + response.setResponseObject(null); + } else { + UserItem userItem = DomainMapper.createUserItem(patientEncounter.getDoctor()); + response.setResponseObject(userItem); + } + } catch (Exception ex) { + response.addError("", "error finding encounter"); + } + return response; + } + /** * {@inheritDoc} */ @@ -210,10 +295,11 @@ public ServiceResponse> findCurrentTabFieldsByEncounte response.addError("exception", ex.getMessage()); } - return response; } + + /** * {@inheritDoc} */ @@ -263,7 +349,7 @@ public ServiceResponse> createPatientEncounterTabFields(List< List tabFieldItemsToReturn = new ArrayList<>(); for (IPatientEncounterTabField petf : savedTabFields) { - tabFieldItemsToReturn.add(domainMapper.createTabFieldItem(petf)); + tabFieldItemsToReturn.add(DomainMapper.createTabFieldItem(petf)); } response.setResponseObject(tabFieldItemsToReturn); } catch (Exception ex) { @@ -277,163 +363,31 @@ public ServiceResponse> createPatientEncounterTabFields(List< * {@inheritDoc} */ @Override - public ServiceResponse>> getCustomFields(int encounterId) { - ServiceResponse>> response = new ServiceResponse<>(); - if (encounterId < 1) { - response.addError("", "encounterId must be greater than 0"); - return response; - } - Map> customFieldMap = new HashMap<>(); - ExpressionList query = QueryProvider.getTabQuery() + public ServiceResponse> findProblemItems(int encounterId) { + ServiceResponse> response = new ServiceResponse<>(); + List problemItems = new ArrayList<>(); + Query query = QueryProvider.getPatientEncounterTabFieldQuery() + .fetch("tabField") .where() - .eq("isDeleted", false); - try { - //O(n^2) because who gives a fuck - List customTabs = customTabRepository.find(query); - for (ITab ct : customTabs) { - Query query2 = QueryProvider.getTabFieldQuery() - .fetch("tab") - .where() - .eq("isDeleted", false) - .eq("tab.name", ct.getName()) - .order() - .asc("sort_order"); - - - List customFields = tabFieldRepository.find(query2); - List customFieldItems = new ArrayList<>(); - for (ITabField cf : customFields) { - Query query3 = QueryProvider.getPatientEncounterTabFieldQuery() - .where() - .eq("tabField", cf)//somethings fucky - .eq("patient_encounter_id", encounterId) - .order() - .desc("date_taken"); - - List patientEncounterCustomField = patientEncounterTabFieldRepository.find(query3); - if (patientEncounterCustomField != null && patientEncounterCustomField.size() > 0) { - customFieldItems.add(domainMapper.createTabFieldItem(patientEncounterCustomField.get(0))); - } else { - customFieldItems.add(domainMapper.createTabFieldItem(cf)); - } - - - } - customFieldMap.put(ct.getName(), customFieldItems); - - } - response.setResponseObject(customFieldMap); - } catch (Exception ex) { - response.addError("", "error"); - return response; - } - - return response; - } - - /** - * {@inheritDoc} - */ - @Override - public ServiceResponse> createPatientEncounterVitals(Map patientEncounterVitalMap, int userId, int encounterId) { - ServiceResponse> response = new ServiceResponse<>(); - if (patientEncounterVitalMap == null || userId < 1 || encounterId < 1) { - response.addError("", "invalid parameters"); - return response; - } - List patientEncounterVitals = new ArrayList<>(); - IPatientEncounterVital patientEncounterVital; - IVital vital; - - ExpressionList query; - String currentTime = dateUtils.getCurrentDateTimeString(); - - for (String key : patientEncounterVitalMap.keySet()) { - if (patientEncounterVitalMap.get(key) != null) { - query = QueryProvider.getVitalQuery().where().eq("name", key); - vital = vitalRepository.findOne(query); - - patientEncounterVital = patientEncounterVitalProvider.get(); - patientEncounterVital.setPatientEncounterId(encounterId); - patientEncounterVital.setUserId(userId); - patientEncounterVital.setDateTaken(currentTime); - patientEncounterVital.setVital(vital); - patientEncounterVital.setVitalValue(patientEncounterVitalMap.get(key)); - patientEncounterVitals.add(patientEncounterVital); - } - } - - try { - List vitalItems = new ArrayList<>(); - List newPatientEncounterVitals = patientEncounterVitalRepository.createAll(patientEncounterVitals); - for (IPatientEncounterVital pev : newPatientEncounterVitals) { - vitalItems.add(domainMapper.createVitalItem(pev)); - } - response.setResponseObject(vitalItems); - } catch (Exception ex) { - response.addError("exception", ex.getMessage()); - } - - return response; - } + .eq("patient_encounter_id", encounterId) + .eq("tabField.name", "problem") + .order() + .asc("date_taken"); - /** - * {@inheritDoc} - */ - @Override - public ServiceResponse> getCustomTabs() { - ServiceResponse> response = new ServiceResponse<>(); - ExpressionList query = QueryProvider.getTabQuery() - .where() - .eq("isDeleted", false) - .eq("isCustom", true); try { - List customTabs = customTabRepository.find(query); - List customTabNames = new ArrayList<>(); - - for (ITab t : customTabs) { - customTabNames.add(domainMapper.createTabItem(t)); + List patientEncounterTreatmentFields = patientEncounterTabFieldRepository.find(query); + if (patientEncounterTreatmentFields == null) { + response.addError("", "bad query"); + } else { + for (IPatientEncounterTabField petf : patientEncounterTreatmentFields) { + problemItems.add(domainMapper.createProblemItem(petf)); + } + response.setResponseObject(problemItems); } - response.setResponseObject(customTabNames); } catch (Exception ex) { response.addError("", "error"); } return response; } - - /** - * {@inheritDoc} - */ - @Override - public ServiceResponse checkPatientIn(int encounterId, int userId) { - ServiceResponse response = new ServiceResponse<>(); - if (encounterId < 1) { - response.addError("", "encounterId must be greater than 0"); - return response; - } - - ExpressionList query = QueryProvider.getPatientEncounterQuery() - .where() - .eq("id", encounterId); - - try { - IPatientEncounter patientEncounter = patientEncounterRepository.findOne(query); - patientEncounter.setDateOfMedicalVisit(DateTime.now()); - ExpressionList getUserQuery = QueryProvider.getUserQuery() - .where() - .eq("id", userId); - IUser user = userRepository.findOne(getUserQuery); - patientEncounter.setDoctor(user); - - patientEncounter = patientEncounterRepository.update(patientEncounter); - - - response.setResponseObject(DomainMapper.createPatientEncounterItem(patientEncounter)); - } catch (Exception ex) { - response.addError("exception", ex.getMessage()); - } - - return response; - } } diff --git a/app/femr/business/services/InventoryService.java b/app/femr/business/services/system/InventoryService.java similarity index 95% rename from app/femr/business/services/InventoryService.java rename to app/femr/business/services/system/InventoryService.java index 09cdac93f..35262cfd2 100644 --- a/app/femr/business/services/InventoryService.java +++ b/app/femr/business/services/system/InventoryService.java @@ -16,17 +16,21 @@ along with fEMR. If not, see . If you have any questions, contact . */ -package femr.business.services; +package femr.business.services.system; import com.avaje.ebean.ExpressionList; -import com.avaje.ebean.Query; import com.google.inject.Inject; import femr.business.helpers.DomainMapper; import femr.business.helpers.QueryProvider; -import femr.common.dto.ServiceResponse; -import femr.data.models.*; +import femr.business.services.core.IInventoryService; +import femr.common.dtos.ServiceResponse; import femr.data.daos.IRepository; import femr.common.models.MedicationItem; +import femr.data.models.core.*; +import femr.data.models.mysql.Medication; +import femr.data.models.mysql.MedicationActiveDrugName; +import femr.data.models.mysql.MedicationForm; +import femr.data.models.mysql.MedicationMeasurementUnit; import java.util.ArrayList; import java.util.List; diff --git a/app/femr/business/services/PharmacyService.java b/app/femr/business/services/system/MedicationService.java similarity index 67% rename from app/femr/business/services/PharmacyService.java rename to app/femr/business/services/system/MedicationService.java index 2e40eb370..62623fd20 100644 --- a/app/femr/business/services/PharmacyService.java +++ b/app/femr/business/services/system/MedicationService.java @@ -16,49 +16,37 @@ along with fEMR. If not, see . If you have any questions, contact . */ -package femr.business.services; +package femr.business.services.system; import com.avaje.ebean.*; +import com.google.gson.JsonObject; import com.google.inject.Inject; import femr.business.helpers.DomainMapper; import femr.business.helpers.QueryProvider; +import femr.business.services.core.IMedicationService; +import femr.common.dtos.ServiceResponse; import femr.common.models.PrescriptionItem; -import femr.common.dto.ServiceResponse; -import femr.common.models.ProblemItem; -import femr.common.models.VitalItem; -import femr.data.models.IUser; -import femr.data.models.User; import femr.data.daos.IRepository; -import femr.data.models.*; +import femr.data.models.core.IMedication; +import femr.data.models.core.IPatientPrescription; +import femr.data.models.mysql.Medication; +import femr.data.models.mysql.PatientPrescription; import femr.util.stringhelpers.StringUtils; -import org.joda.time.DateTime; - import java.util.ArrayList; import java.util.List; -public class PharmacyService implements IPharmacyService { +public class MedicationService implements IMedicationService { + private final IRepository medicationRepository; - private final IRepository patientEncounterRepository; - private final IRepository patientEncounterTabFieldRepository; - private final IRepository patientEncounterVitalRepository; private final IRepository patientPrescriptionRepository; - private final IRepository userRepository; private final DomainMapper domainMapper; @Inject - public PharmacyService(IRepository patientPrescriptionRepository, - IRepository patientEncounterTabFieldRepository, - IRepository patientEncounterVitalRepository, - IRepository medicationRepository, - IRepository patientEncounterRepository, - IRepository userRepository, - DomainMapper domainMapper) { - this.patientPrescriptionRepository = patientPrescriptionRepository; - this.patientEncounterTabFieldRepository = patientEncounterTabFieldRepository; - this.patientEncounterVitalRepository = patientEncounterVitalRepository; + public MedicationService(IRepository medicationRepository, + IRepository patientPrescriptionRepository, + DomainMapper domainMapper) { this.medicationRepository = medicationRepository; - this.patientEncounterRepository = patientEncounterRepository; - this.userRepository = userRepository; + this.patientPrescriptionRepository = patientPrescriptionRepository; this.domainMapper = domainMapper; } @@ -66,24 +54,22 @@ public PharmacyService(IRepository patientPrescriptionRepo * {@inheritDoc} */ @Override - public ServiceResponse checkPatientIn(int encounterId, int userId) { - ServiceResponse response = new ServiceResponse<>(); - if (encounterId < 1) { - response.addError("", "encounterId can not be less than 1"); - return response; - } + public ServiceResponse getMedicationNames() { + + ServiceResponse response = new ServiceResponse<>(); try { - ExpressionList query = QueryProvider.getPatientEncounterQuery().where().eq("id", encounterId); - IPatientEncounter patientEncounter = patientEncounterRepository.findOne(query); - patientEncounter.setDateOfPharmacyVisit(DateTime.now()); - ExpressionList getUserQuery = QueryProvider.getUserQuery() - .where() - .eq("id", userId); - IUser user = userRepository.findOne(getUserQuery); - patientEncounter.setPharmacist(user); - patientEncounter = patientEncounterRepository.update(patientEncounter); - response.setResponseObject(patientEncounter); + List medicationNames = new ArrayList<>(); + List medications = medicationRepository.findAll(Medication.class); + + JsonObject jsonObject = new JsonObject(); + if (medications != null) { + for (int medicationIndex = 0; medicationIndex < medications.size(); medicationIndex++) { + jsonObject.addProperty("medicine" + medicationIndex, medications.get(medicationIndex).getName()); + } + } + + response.setResponseObject(jsonObject.toString()); } catch (Exception ex) { response.addError("exception", ex.getMessage()); } @@ -116,7 +102,6 @@ public ServiceResponse createAndReplacePrescription(Prescripti //replace the old prescription oldPatientPrescription.setReplacementId(newPatientPrescription.getId()); - oldPatientPrescription.setDispensed(false); patientPrescriptionRepository.update(oldPatientPrescription); PrescriptionItem newPrescriptionItem = domainMapper.createPrescriptionItem(newPatientPrescription); @@ -132,65 +117,26 @@ public ServiceResponse createAndReplacePrescription(Prescripti * {@inheritDoc} */ @Override - public ServiceResponse> findProblemItems(int encounterId) { - ServiceResponse> response = new ServiceResponse<>(); - List problemItems = new ArrayList<>(); - Query query = QueryProvider.getPatientEncounterTabFieldQuery() - .fetch("tabField") - .where() - .eq("patient_encounter_id", encounterId) - .eq("tabField.name", "problem") - .order() - .asc("date_taken"); - - try { - List patientEncounterTreatmentFields = patientEncounterTabFieldRepository.find(query); - if (patientEncounterTreatmentFields == null) { - response.addError("", "bad query"); - } else { - for (IPatientEncounterTabField petf : patientEncounterTreatmentFields) { - problemItems.add(domainMapper.createProblemItem(petf)); - } - response.setResponseObject(problemItems); - } - } catch (Exception ex) { - response.addError("", "error"); + public ServiceResponse> createPatientPrescriptions(List prescriptionItems, int userId, int encounterId, boolean isDispensed, boolean isCounseled) { + ServiceResponse> response = new ServiceResponse<>(); + if (prescriptionItems == null || userId < 1 || encounterId < 1) { + response.addError("", "invalid parameters"); + return response; } - return response; - } - - /** - * {@inheritDoc} - */ - @Override - public ServiceResponse> findAllMedications() { - - ServiceResponse> response = new ServiceResponse<>(); + List patientPrescriptions = new ArrayList<>(); + for (PrescriptionItem pi : prescriptionItems) { + IMedication medication = domainMapper.createMedication(pi.getName()); + patientPrescriptions.add(domainMapper.createPatientPrescription(0, medication, userId, encounterId, null, isDispensed, isCounseled)); + } try { - List medicationNames = new ArrayList<>(); - - //List medications = medicationRepository.findAll(Medication.class); - - //use raw sql to temporarily filter out the duplicate medication names - //after implementing the inventory tracking feature, this shouldn't be needed - //as duplicates will never exist. - //Also - ebeans "setDistinct" method has known bugs in it hence rawsql crap - String rawSqlString = "SELECT id, name FROM medications GROUP BY name"; - RawSql rawSql = RawSqlBuilder.parse(rawSqlString).create(); - - Query medicationQuery = Ebean.find(Medication.class); - medicationQuery.setRawSql(rawSql); - - List medications = medicationQuery.findList(); - - - - for (IMedication m : medications) { - medicationNames.add(m.getName()); + List newPatientPrescriptions = patientPrescriptionRepository.createAll(patientPrescriptions); + List newPrescriptionItems = new ArrayList<>(); + for (IPatientPrescription pp : newPatientPrescriptions) { + newPrescriptionItems.add(domainMapper.createPatientPrescriptionItem(pp)); } - response.setResponseObject(medicationNames); + response.setResponseObject(newPrescriptionItems); } catch (Exception ex) { response.addError("exception", ex.getMessage()); } @@ -232,7 +178,7 @@ public ServiceResponse> markPrescriptionsAsFilled(List> markPrescriptionsAsCounseled(List prescriptionIds){ + public ServiceResponse> markPrescriptionsAsCounseled(List prescriptionIds) { ServiceResponse> response = new ServiceResponse<>(); List updatedPrescriptions = new ArrayList<>(); @@ -257,5 +203,40 @@ public ServiceResponse> markPrescriptionsAsCounseled(List return response; } -} + /** + * {@inheritDoc} + */ + @Override + public ServiceResponse> findAllMedications() { + ServiceResponse> response = new ServiceResponse<>(); + + try { + List medicationNames = new ArrayList<>(); + + //List medications = medicationRepository.findAll(Medication.class); + + //use raw sql to temporarily filter out the duplicate medication names + //after implementing the inventory tracking feature, this shouldn't be needed + //as duplicates will never exist. + //Also - ebeans "setDistinct" method has known bugs in it hence rawsql crap + String rawSqlString = "SELECT id, name FROM medications GROUP BY name"; + RawSql rawSql = RawSqlBuilder.parse(rawSqlString).create(); + + Query medicationQuery = Ebean.find(Medication.class); + medicationQuery.setRawSql(rawSql); + + List medications = medicationQuery.findList(); + + + for (IMedication m : medications) { + medicationNames.add(m.getName()); + } + response.setResponseObject(medicationNames); + } catch (Exception ex) { + response.addError("exception", ex.getMessage()); + } + + return response; + } +} diff --git a/app/femr/business/services/system/MissionTripService.java b/app/femr/business/services/system/MissionTripService.java new file mode 100644 index 000000000..8b1077e5c --- /dev/null +++ b/app/femr/business/services/system/MissionTripService.java @@ -0,0 +1,336 @@ +/* + fEMR - fast Electronic Medical Records + Copyright (C) 2014 Team fEMR + + fEMR is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + fEMR is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with fEMR. If not, see . If + you have any questions, contact . +*/ +package femr.business.services.system; + +import com.avaje.ebean.ExpressionList; +import com.avaje.ebean.Query; +import com.google.inject.Inject; +import femr.business.helpers.DomainMapper; +import femr.business.helpers.QueryProvider; +import femr.business.services.core.IMissionTripService; +import femr.common.dtos.ServiceResponse; +import femr.common.models.CityItem; +import femr.common.models.MissionItem; +import femr.common.models.TeamItem; +import femr.common.models.TripItem; +import femr.data.daos.IRepository; +import femr.data.models.core.IMissionCity; +import femr.data.models.core.IMissionCountry; +import femr.data.models.core.IMissionTeam; +import femr.data.models.core.IMissionTrip; +import femr.data.models.mysql.MissionCity; +import femr.data.models.mysql.MissionCountry; +import femr.data.models.mysql.MissionTeam; +import femr.data.models.mysql.MissionTrip; +import femr.util.stringhelpers.StringUtils; + +import java.util.ArrayList; +import java.util.List; + +public class MissionTripService implements IMissionTripService { + + private final IRepository missionCityRepository; + private final IRepository missionCountryRepository; + private final IRepository missionTeamRepository; + private final IRepository missionTripRepository; + private final DomainMapper domainMapper; + + @Inject + public MissionTripService(IRepository missionCityRepository, + IRepository missionCountryRepository, + IRepository missionTeamRepository, + IRepository missionTripRepository, + DomainMapper domainMapper) { + + this.missionCityRepository = missionCityRepository; + this.missionCountryRepository = missionCountryRepository; + this.missionTripRepository = missionTripRepository; + this.missionTeamRepository = missionTeamRepository; + this.domainMapper = domainMapper; + } + + /** + * {@inheritDoc} + */ + @Override + public IMissionTrip findCurrentMissionTrip() { + + return getCurrentMissionTrip(); + } + + /** + * {@inheritDoc} + */ + @Override + public ServiceResponse> findAvailableTeams() { + + ServiceResponse> response = new ServiceResponse<>(); + List teams = new ArrayList<>(); + Query missionTeamQuery = QueryProvider.getMissionTeamQuery() + .orderBy("name"); + List missionTeams = missionTeamRepository.find(missionTeamQuery); + for (IMissionTeam mt : missionTeams) { + teams.add(mt.getName()); + } + response.setResponseObject(teams); + return response; + } + + /** + * {@inheritDoc} + */ + @Override + public ServiceResponse> findAvailableCities() { + + ServiceResponse> response = new ServiceResponse<>(); + List cities = new ArrayList<>(); + Query missionCityQuery = QueryProvider.getMissionCityQuery() + .orderBy("name"); + List missionCities = missionCityRepository.find(missionCityQuery); + for (IMissionCity mc : missionCities) { + cities.add(DomainMapper.createCityItem(mc.getName(), mc.getMissionCountry().getName())); + } + response.setResponseObject(cities); + return response; + } + + /** + * {@inheritDoc} + */ + @Override + public ServiceResponse> findAvailableCountries() { + + ServiceResponse> response = new ServiceResponse<>(); + List countries = new ArrayList<>(); + Query missionCountryQuery = QueryProvider.getMissionCountryQuery() + .orderBy("name"); + List missionCountries = missionCountryRepository.find(missionCountryQuery); + for (IMissionCountry mc : missionCountries) { + countries.add(mc.getName()); + } + response.setResponseObject(countries); + return response; + } + + /** + * {@inheritDoc} + */ + @Override + public ServiceResponse> findAllTripInformation() { + + ServiceResponse> response = new ServiceResponse<>(); + List missionItems = new ArrayList<>(); + + try { + //start by getting all available mission teams. If you start by getting all the trips then + //you might miss some teams that don't have a trip, yet. + List missionTeams = missionTeamRepository.findAll(MissionTeam.class); + for (IMissionTeam missionTeam : missionTeams) { + missionItems.add(DomainMapper.createMissionItem(missionTeam)); + } + + response.setResponseObject(missionItems); + } catch (Exception ex) { + + response.addError("", ex.getMessage()); + } + + return response; + } + + /** + * {@inheritDoc} + */ + public ServiceResponse createNewTeam(TeamItem teamItem) { + + ServiceResponse response = new ServiceResponse<>(); + if (teamItem == null || StringUtils.isNullOrWhiteSpace(teamItem.getName())) { + + response.addError("", "team must have a name"); + } else { + + try { + + IMissionTeam missionTeam = domainMapper.createMissionTeam(teamItem.getName(), teamItem.getLocation(), teamItem.getDescription()); + missionTeam = missionTeamRepository.create(missionTeam); + response.setResponseObject(DomainMapper.createTeamItem(missionTeam.getName(), missionTeam.getLocation(), missionTeam.getDescription())); + } catch (Exception ex) { + + response.addError("", ex.getMessage()); + } + } + + return response; + } + + /** + * {@inheritDoc} + */ + public ServiceResponse createNewTrip(TripItem tripItem) { + + ServiceResponse response = new ServiceResponse<>(); + if (tripItem == null || + StringUtils.isNullOrWhiteSpace(tripItem.getTeamName()) || + StringUtils.isNullOrWhiteSpace(tripItem.getTripCity()) || + StringUtils.isNullOrWhiteSpace(tripItem.getTripCountry()) || + tripItem.getTripStartDate() == null) { + response.addError("", "you're missing required fields, try again"); + } else { + try { + + + ExpressionList missionTeamExpressionList = QueryProvider.getMissionTeamQuery() + .where() + .eq("name", tripItem.getTeamName()); + IMissionTeam missionTeam = missionTeamRepository.findOne(missionTeamExpressionList); + + ExpressionList missionCountryExpressionList = QueryProvider.getMissionCountryQuery() + .where() + .eq("name", tripItem.getTripCountry()); + IMissionCountry missionCountry = missionCountryRepository.findOne(missionCountryExpressionList); + + if (missionCountry == null) { + //make sure we have a country to work with + response.addError("", "someone sent a bad country in the request"); + } else if (missionTeam == null) { + //make sure we have a team to work with + response.addError("", "someone sent a bad team name in the request"); + } else { + + ExpressionList missionCityExpressionList = QueryProvider.getMissionCityQuery() + .where() + .eq("name", tripItem.getTripCity()) + .eq("missionCountry", missionCountry); + IMissionCity missionCity = missionCityRepository.findOne(missionCityExpressionList); + + if (missionCity == null) { + //city doesn't exist + missionCity = domainMapper.createMissionCity(tripItem.getTripCity(), missionCountry); + missionCity = missionCityRepository.create(missionCity); + } + + + IMissionTrip missionTrip = domainMapper.createMissionTrip(tripItem.getTripStartDate(), tripItem.getTripEndDate(), false, missionCity, missionTeam); + missionTrip = missionTripRepository.create(missionTrip); + response.setResponseObject(DomainMapper.createTripItem(missionTrip.getMissionTeam().getName(), missionTrip.getMissionCity().getName(), missionTrip.getMissionCity().getMissionCountry().getName(), missionTrip.getStartDate(), missionTrip.getEndDate())); + + } + } catch (Exception ex) { + + response.addError("", ex.getMessage()); + } + } + + return response; + } + + /** + * Get the current mission trip. + * + * @return null if none or more than one exists + */ + private IMissionTrip getCurrentMissionTrip() { + ExpressionList missionTripQuery = QueryProvider.getMissionTripQuery() + .where() + .eq("isCurrent", true); + IMissionTrip missionTrip = null; + + try { + missionTrip = missionTripRepository.findOne(missionTripQuery); + } catch (Exception ex) { + + } + + return missionTrip; + } + + /** + * {@inheritDoc} + */ + public ServiceResponse createNewCity(String cityName, String countryName) { + + ServiceResponse response = new ServiceResponse<>(); + + ExpressionList missionCountryExpressionList = QueryProvider.getMissionCountryQuery() + .where() + .eq("name", countryName); + try { + + IMissionCountry missionCountry = missionCountryRepository.findOne(missionCountryExpressionList); + if (missionCountry == null) { + response.addError("", "that country does not exist"); + } else { + + //check for duplicate + List missionCities = missionCityRepository.findAll(MissionCity.class); + boolean isDuplicate = false; + for (IMissionCity mc : missionCities){ + if (mc.getName().toUpperCase().equals(cityName.toUpperCase())){ + isDuplicate = true; + response.addError("", "duplicate city"); + } + } + if (!isDuplicate){ + IMissionCity missionCity = domainMapper.createMissionCity(cityName, missionCountry); + missionCity = missionCityRepository.create(missionCity); + response.setResponseObject(DomainMapper.createCityItem(missionCity.getName(), missionCity.getMissionCountry().getName())); + } + } + } catch (Exception ex) { + + response.addError("", "there was an issue saving the city"); + } + + return response; + } + + /** + * {@inheritDoc} + */ + public ServiceResponse updateCurrentTrip(int tripId) { + + ServiceResponse response = new ServiceResponse<>(); + ExpressionList missionTripExpressionList = QueryProvider.getMissionTripQuery() + .where() + .eq("id", tripId); + try { + IMissionTrip missionTrip = missionTripRepository.findOne(missionTripExpressionList); + if (missionTrip == null) { + response.addError("", "could not find a trip with that id"); + } else { + List allTrips = missionTripRepository.findAll(MissionTrip.class); + for (IMissionTrip mt : allTrips) { + if (mt.getId() == missionTrip.getId()) { + mt.setCurrent(true); + } else { + mt.setCurrent(false); + } + missionTripRepository.update(mt); + response.setResponseObject(DomainMapper.createTripItem(mt.getMissionTeam().getName(), mt.getMissionCity().getName(), mt.getMissionCity().getMissionCountry().getName(), mt.getStartDate(), mt.getEndDate())); + } + } + + } catch (Exception ex) { + + response.addError("", ex.getMessage()); + } + + return response; + } +} diff --git a/app/femr/business/services/system/PatientService.java b/app/femr/business/services/system/PatientService.java new file mode 100644 index 000000000..bcb8ed4b5 --- /dev/null +++ b/app/femr/business/services/system/PatientService.java @@ -0,0 +1,131 @@ +/* + fEMR - fast Electronic Medical Records + Copyright (C) 2014 Team fEMR + + fEMR is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + fEMR is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with fEMR. If not, see . If + you have any questions, contact . +*/ +package femr.business.services.system; + +import com.avaje.ebean.ExpressionList; +import com.avaje.ebean.Query; +import com.google.inject.Inject; +import femr.business.helpers.DomainMapper; +import femr.business.helpers.QueryProvider; +import femr.business.services.core.IPatientService; +import femr.common.dtos.ServiceResponse; +import femr.common.models.PatientItem; +import femr.data.daos.IRepository; +import femr.data.models.core.*; +import femr.data.models.mysql.Patient; +import femr.data.models.mysql.PatientAgeClassification; +import femr.util.stringhelpers.StringUtils; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; + +public class PatientService implements IPatientService { + + private final IRepository patientRepository; + private final IRepository patientAgeClassificationRepository; + private final DomainMapper domainMapper; + + @Inject + public PatientService(IRepository patientRepository, + IRepository patientAgeClassificationRepository, + DomainMapper domainMapper){ + + this.patientRepository = patientRepository; + this.patientAgeClassificationRepository = patientAgeClassificationRepository; + this.domainMapper = domainMapper; + } + + /** + * {@inheritDoc} + */ + public ServiceResponse> findPossibleAgeClassifications() { + ServiceResponse> response = new ServiceResponse<>(); + Map patientAgeClassificationStrings = new LinkedHashMap<>(); + try { + Query patientAgeClassificationExpressionList = QueryProvider.getPatientAgeClassificationQuery() + .where() + .eq("isDeleted", false) + .order() + .asc("sortOrder"); + List patientAgeClassifications = patientAgeClassificationRepository.find(patientAgeClassificationExpressionList); + for (IPatientAgeClassification pac : patientAgeClassifications) { + patientAgeClassificationStrings.put(pac.getName(), pac.getDescription()); + } + response.setResponseObject(patientAgeClassificationStrings); + } catch (Exception ex) { + response.addError("", ex.getMessage()); + } + return response; + } + + /** + * {@inheritDoc} + */ + @Override + public ServiceResponse findPatientAndUpdateSex(int id, String sex) { + ServiceResponse response = new ServiceResponse<>(); + if (id < 1) { + response.addError("", "patient id can not be less than 1"); + return response; + } + + ExpressionList query = QueryProvider.getPatientQuery() + .where() + .eq("id", id); + + try { + IPatient savedPatient = patientRepository.findOne(query); + //if a patient doesn't have a sex and the + //user is trying to identify the patients sex + if (StringUtils.isNullOrWhiteSpace(savedPatient.getSex()) && StringUtils.isNotNullOrWhiteSpace(sex)) { + savedPatient.setSex(sex); + savedPatient = patientRepository.update(savedPatient); + } + PatientItem patientItem = DomainMapper.createPatientItem(savedPatient, null, null, null, null); + response.setResponseObject(patientItem); + + } catch (Exception ex) { + response.addError("exception", ex.getMessage()); + } + + return response; + } + + /** + * {@inheritDoc} + */ + @Override + public ServiceResponse createPatient(PatientItem patient) { + ServiceResponse response = new ServiceResponse<>(); + if (patient == null) { + response.addError("", "no patient received"); + return response; + } + + try { + IPatient newPatient = domainMapper.createPatient(patient); + newPatient = patientRepository.create(newPatient); + response.setResponseObject(DomainMapper.createPatientItem(newPatient, null, null, null, null)); + } catch (Exception ex) { + response.addError("exception", ex.getMessage()); + } + + return response; + } +} diff --git a/app/femr/business/services/PhotoService.java b/app/femr/business/services/system/PhotoService.java similarity index 97% rename from app/femr/business/services/PhotoService.java rename to app/femr/business/services/system/PhotoService.java index 6fcf8d88d..273c1da6f 100644 --- a/app/femr/business/services/PhotoService.java +++ b/app/femr/business/services/system/PhotoService.java @@ -16,10 +16,9 @@ along with fEMR. If not, see . If you have any questions, contact . */ -package femr.business.services; +package femr.business.services.system; import com.avaje.ebean.ExpressionList; -import com.typesafe.config.ConfigFactory; import java.awt.image.BufferedImage; import java.io.*; @@ -31,12 +30,18 @@ import femr.business.helpers.DomainMapper; import femr.business.helpers.LogicDoer; import femr.business.helpers.QueryProvider; +import femr.business.services.core.IPhotoService; import femr.common.models.PatientEncounterItem; -import femr.common.dto.ServiceResponse; +import femr.common.dtos.ServiceResponse; import com.google.inject.Inject; import femr.common.models.PhotoItem; import femr.data.daos.IRepository; -import femr.data.models.*; +import femr.data.models.core.IPatient; +import femr.data.models.core.IPatientEncounterPhoto; +import femr.data.models.core.IPhoto; +import femr.data.models.mysql.Patient; +import femr.data.models.mysql.PatientEncounterPhoto; +import femr.data.models.mysql.Photo; import femr.ui.models.medical.EditViewModelPost; import femr.util.stringhelpers.StringUtils; import org.apache.commons.codec.binary.Base64; diff --git a/app/femr/business/services/system/ResearchService.java b/app/femr/business/services/system/ResearchService.java new file mode 100644 index 000000000..1a94d4cfb --- /dev/null +++ b/app/femr/business/services/system/ResearchService.java @@ -0,0 +1,1052 @@ +/* + fEMR - fast Electronic Medical Records + Copyright (C) 2014 Team fEMR + + fEMR is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + fEMR is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with fEMR. If not, see . If + you have any questions, contact . +*/ +package femr.business.services.system; + +import com.avaje.ebean.Query; +import com.google.inject.Inject; +import femr.business.services.core.IResearchService; +import femr.business.helpers.DomainMapper; +import femr.business.helpers.QueryProvider; +import femr.common.dtos.ServiceResponse; +import femr.common.models.*; +import femr.ui.models.research.json.ResearchGraphDataItem; +import femr.data.daos.IRepository; +import femr.data.models.core.*; +import femr.data.models.mysql.Medication; +import femr.data.models.mysql.PatientEncounter; +import femr.data.models.mysql.PatientEncounterVital; +import femr.data.models.mysql.PatientPrescription; +import femr.util.calculations.dateUtils; +import femr.util.stringhelpers.StringUtils; +import org.apache.commons.lang3.text.WordUtils; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.*; + +public class ResearchService implements IResearchService { + + private final IRepository patientEncounterRepository; + private final IRepository patientEncounterVitalRepository; + protected final IRepository vitalRepository; + private final IRepository prescriptionRepository; + private final IRepository medicationRepository; + private final DomainMapper domainMapper; + + /** + * Initializes the research service and injects the dependence + */ + @Inject + public ResearchService(IRepository patientEncounterRepository, + IRepository patientEncounterVitaRepository, + IRepository vitalRepository, + IRepository prescriptionRepository, + IRepository medicationRepository, + DomainMapper domainMapper) { + + this.patientEncounterRepository = patientEncounterRepository; + this.patientEncounterVitalRepository = patientEncounterVitaRepository; + this.vitalRepository = vitalRepository; + this.prescriptionRepository = prescriptionRepository; + this.medicationRepository = medicationRepository; + this.domainMapper = domainMapper; + } + + + @Override + public ServiceResponse getGraphData(ResearchFilterItem filters){ + + ServiceResponse response = new ServiceResponse<>(); + + String primaryDatasetName = filters.getPrimaryDataset(); + //TODO: gender throws error here due to patients with no sex + ResearchResult primaryItems = getDatasetItems(primaryDatasetName, filters); + + ResearchResult secondaryItems = new ResearchResult(); + String secondaryDatasetName = filters.getSecondaryDataset(); + if (!secondaryDatasetName.isEmpty()) { + + secondaryItems = getDatasetItems(secondaryDatasetName, filters); + } + + try{ + ResearchGraphDataItem graphDataItem = createResearchGraphItem(primaryItems, secondaryItems, filters); + response.setResponseObject(graphDataItem); + } catch (Exception ex) { + response.addError("exception", ex.getMessage()); + } + + return response; + } + + @Override + public ServiceResponse> getAllMedications(){ + + ServiceResponse> response = new ServiceResponse<>(); + + try { + List medications = medicationRepository.findAll(Medication.class); + + Map medicationItems = new HashMap<>(); + + for (IMedication medication : medications) { + + medicationItems.put( + medication.getId(), + medication.getName() + ); + } + response.setResponseObject(medicationItems); + + } catch (Exception ex) { + response.addError("exception", ex.getMessage()); + } + + return response; + } + + public static ResearchGraphDataItem createResearchGraphItem(ResearchResult primaryResult, ResearchResult secondaryResult, ResearchFilterItem filters) { + + ResearchGraphDataItem graphModel = new ResearchGraphDataItem(); + List graphData = new ArrayList<>(); + Map groupedData = new HashMap<>(); + + String yAxisTitle = "Number of Patients"; + String xAxisTitle = WordUtils.capitalize(StringUtils.splitCamelCase(primaryResult.getDataType())); + String unitOfMeasurement = primaryResult.getUnitOfMeasurement(); + + List sortedPrimary = new ArrayList<>(); + Map primaryDataset = primaryResult.getDataset(); + Map secondaryDataset = secondaryResult.getDataset(); + int sampleSize = primaryDataset.size(); + float total = 0; + float rangeHigh = 0; + float rangeLow = 10000; + float median = 0; + + // Medications will not group correctly, just bundle and return + if( filters.getPrimaryDataset().equals("prescribedMeds") || + filters.getPrimaryDataset().equals("dispensedMeds") ){ + + for (Integer key : primaryDataset.keySet()) { + + // Make sure all secondary keys are set for all items + Float value = primaryDataset.get(key); + + ResearchItem currItem = new ResearchItem(); + currItem.setPrimaryName(Float.toString((float) key)); + currItem.setPrimaryValue(value); + + graphData.add(currItem); + } + + + graphModel.setAverage(0.0f); + graphModel.setMedian(median); + graphModel.setRangeLow(rangeLow); + graphModel.setRangeHigh(rangeHigh); + graphModel.setGraphData(graphData); + graphModel.setPrimaryValuemap(primaryResult.getValueMap()); + graphModel.setSecondaryValuemap(secondaryResult.getValueMap()); + graphModel.setyAxisTitle(yAxisTitle); + graphModel.setxAxisTitle(xAxisTitle); + graphModel.setUnitOfMeasurement(unitOfMeasurement); + return graphModel; + } + + + // total the individual patients based on their value + Map primaryGraphTotals = new HashMap<>(); + + // used to ensure all secondary keys are present in all items, just in case they have no data + Map secondaryKeyset = new HashMap<>(); + + for( Integer key : primaryDataset.keySet() ){ + + Float value = primaryDataset.get(key); + sortedPrimary.add(value); + + // Find current primary Value and add to builder map + ResearchItem currItem; + if( primaryGraphTotals.containsKey(value) ){ + + currItem = primaryGraphTotals.get(value); + float currItemTotal = currItem.getPrimaryValue() + 1; + currItem.setPrimaryValue(currItemTotal); + } + else{ + + currItem = new ResearchItem(); + currItem.setPrimaryValue(1); + } + currItem.setPrimaryName(value.toString()); + + // check for and add secondary item to total + if( secondaryDataset.containsKey(key) ) { + + // Get secondary item form current ResearchItem + Map secondaryItems = currItem.getSecondaryData(); + Float secondaryValue = secondaryDataset.get(key); + Float secondaryTotal = 1.0f; + String secondaryKey = secondaryValue.toString(); + + // Keep track of unique keys for secondary items + // want to make sure all possible keys are present in graphData + secondaryKeyset.put(secondaryKey, 0); + + if (secondaryItems.containsKey(secondaryKey)) { + + secondaryTotal = secondaryItems.get(secondaryKey); + secondaryTotal++; + secondaryItems.put(secondaryKey, secondaryTotal); + } + else{ + + secondaryItems.put(secondaryKey, 1.0f); + } + + // add secondary totals to currItem + currItem.setSecondaryData(secondaryItems); + } + + + primaryGraphTotals.put(value, currItem); + + // Calculate Stats while building data + // check range + if( value > rangeHigh ){ + rangeHigh = value; + } + if( value < rangeLow){ + rangeLow = value; + } + + // sum total for average + total += value; + + } + + // If no grouping and over 30 items, force groups of 10 + if( primaryGraphTotals.keySet().size() > 30 && !filters.isGroupPrimary() + && (filters.getGraphType().equals("pie") || filters.getGraphType().equals("stacked-bar") || filters.getGraphType().equals("grouped-bar") ) ){ + + filters.setGroupPrimary(true); + filters.setGroupFactor(10); + } + + // Build group key values -- don't bother if there will only be 1 group + // make happen automatically too? -- primaryGraphTotals.keySet().size() > 20 + if( filters.isGroupPrimary() && primaryGraphTotals.keySet().size() > filters.getGroupFactor() ) { + + int groupFactor = filters.getGroupFactor(); + int firstLowKey = (int)(rangeLow / groupFactor) * groupFactor; + int lastLowKey = (int)(rangeHigh / groupFactor) * groupFactor; + + //int totalGroups = (int)((lastLowKey-firstLowKey) / groupFactor); + List groupIndexes = new ArrayList(); + for( int low = firstLowKey; low <= lastLowKey; low+=groupFactor ){ + + int lowTemp = low; + if( low < filters.getRangeStart() ){ + + lowTemp = filters.getRangeStart().intValue(); + } + + int high = low + (groupFactor - 1); + if( high > filters.getRangeEnd() ){ + + high = filters.getRangeEnd().intValue(); + } + + String groupIndex = String.format("%d - %d", lowTemp, high); + groupIndexes.add(groupIndex); + + ResearchItem blankItem = new ResearchItem(groupIndex); + groupedData.put(groupIndex, blankItem); + } + + for (Float key : primaryGraphTotals.keySet()) { + + ResearchItem currItem = primaryGraphTotals.get(key); + + Float newVal = Float.parseFloat(currItem.getPrimaryName()); + Float newCount = currItem.getPrimaryValue(); + + int targetGroup = (int)(newVal / groupFactor) - (firstLowKey / groupFactor); + String groupIndex = groupIndexes.get(targetGroup); + + ResearchItem finalItem; + if( groupedData.containsKey(groupIndex) ){ + + // add current single item to existing group Item + finalItem = groupedData.get(groupIndex); + + Float currCount = finalItem.getPrimaryValue(); + currCount += newCount; + finalItem.setPrimaryValue(currCount); + + Map currSecondaryData = currItem.getSecondaryData(); + for( String sKey : currSecondaryData.keySet() ){ + + Float sCount = currSecondaryData.get(sKey); + + Map finalSecondaryData = finalItem.getSecondaryData(); + if( finalSecondaryData.containsKey(sKey) ){ + + Float finalCount = finalSecondaryData.get(sKey); + finalCount += sCount; + finalSecondaryData.put(sKey, finalCount); + } + else{ + + finalSecondaryData.put(sKey, sCount); + } + + finalItem.setSecondaryData(finalSecondaryData); + } + + } + else{ + + // haven't encountered item in range before, just set to current single item + finalItem = new ResearchItem(); + finalItem.setPrimaryName(groupIndex); + finalItem.setPrimaryValue(newCount); + finalItem.setSecondaryData(currItem.getSecondaryData()); + + } + // add item to grouped data + groupedData.put(groupIndex, finalItem); + } + + SortedSet keys = new TreeSet<>(new GroupedCompare()); + keys.addAll(groupedData.keySet()); + for (String key : keys) { + + // Make sure all secondary keys are set for all items + ResearchItem currItem = groupedData.get(key); + Map secondaryData = currItem.getSecondaryData(); + for (String secondaryKey : secondaryKeyset.keySet()) { + + if( !secondaryData.containsKey(secondaryKey) ){ + + secondaryData.put(secondaryKey, 0.0f); + } + } + + graphData.add(currItem); + } + + } + else{ + + SortedSet keys = new TreeSet<>(primaryGraphTotals.keySet()); + for (Float key : keys) { + + // Make sure all secondary keys are set for all items + ResearchItem currItem = primaryGraphTotals.get(key); + Map secondaryData = currItem.getSecondaryData(); + for (String secondaryKey : secondaryKeyset.keySet()) { + + if( !secondaryData.containsKey(secondaryKey) ){ + + secondaryData.put(secondaryKey, 0.0f); + } + } + + graphData.add(currItem); + } + } + + + + // Sort primary Data + Collections.sort(sortedPrimary); + + // Get Median Value from sorted list + float average = total / sampleSize; + + if( sampleSize > 1 ) { + if (sampleSize % 2 == 0) { + + int i = (sampleSize / 2) - 1; + int j = i + 1; + + // get vals i and j + float val1 = sortedPrimary.get(i); + float val2 = sortedPrimary.get(j); + + + //Integer key1 = primaryKeyList.get(i); + //Integer key2 = primaryKeyList.get(j); + + //float val1 = primaryDataset.get(key1); + //float val2 = primaryDataset.get(key2); + + median = (val1 + val2) / 2; + } else { + + int i = (int) Math.floor(sampleSize / 2); + + //Integer key = primaryKeyList.get(i); + //median = primaryDataset.get(key); + + median = sortedPrimary.get(i); + + } + } + else{ + + median = sortedPrimary.get(0); + } + + // build graph model item + + graphModel.setAverage(average); + graphModel.setMedian(median); + graphModel.setRangeLow(rangeLow); + graphModel.setRangeHigh(rangeHigh); + graphModel.setGraphData(graphData); + graphModel.setPrimaryValuemap(primaryResult.getValueMap()); + graphModel.setSecondaryValuemap(secondaryResult.getValueMap()); + graphModel.setyAxisTitle(yAxisTitle); + graphModel.setxAxisTitle(xAxisTitle); + graphModel.setUnitOfMeasurement(unitOfMeasurement); + + return graphModel; + + } + + + + private ResearchResult getDatasetItems(String datasetName, ResearchFilterItem filters){ + + switch(datasetName){ + + // Single Value Vital Items + case "weight": + case "temperature": + case "heartRate": + case "respiratoryRate": + case "oxygenSaturation": + case "glucose": + case "bloodPressureSystolic": + case "bloodPressureDiastolic": + return getPatientVitals(datasetName, filters); + + // Special Case Vital Item + case "height": + return getPatientHeights(filters); + + // Patient Specific Items + case "age": + case "gender": + case "pregnancyStatus": + case "pregnancyTime": + return getPatientAttribute(datasetName, filters); + + // Medication Items + case "prescribedMeds": + return getPrescribedMedications(filters); + + case "dispensedMeds": + return getDispensedMedications(filters); + + default: + + return new ResearchResult(); + } + + } + + + /** + * {@inheritDoc} + */ + public ResearchResult getPatientVitals(String vitalName, ResearchFilterItem filters) { + + String startDateString = filters.getStartDate(); + String endDateString = filters.getEndDate(); + Integer medicationID = filters.getMedicationId(); + + ResearchResult resultObj = new ResearchResult(); + Map resultItems = new HashMap<>(); + + Date startDateObj; + Date endDateObj; + SimpleDateFormat sqlFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + try { + + // Set Start Date to start of day + String startParseDate = startDateString + " 00:00:00"; + startDateObj = sqlFormat.parse(startParseDate); + + // Set End Date to end of day + String parseEndDate = endDateString + " 23:59:59"; + endDateObj = sqlFormat.parse(parseEndDate); + + } + catch(ParseException e){ + + startDateObj = new Date(); + endDateObj = new Date(); + } + + Query q = QueryProvider.getPatientEncounterVitalQuery(); + + if( medicationID > 0 ) { + + Query pQ = QueryProvider.getPatientPrescriptionQuery(); + + pQ.fetch("patientEncounter").where().eq("medication.id", medicationID); + List patientPrescriptions = prescriptionRepository.find(pQ); + + List scriptEncounterIds = new ArrayList<>(); + int i = 0; + for (IPatientPrescription script : patientPrescriptions) { + + scriptEncounterIds.add(script.getPatientEncounter().getId()); + } + + q.where().in("patientEncounterId", scriptEncounterIds); + } + + q.where() + .gt("dateTaken", sqlFormat.format(startDateObj)) + .lt("dateTaken", sqlFormat.format(endDateObj)) + .eq("vital.name", vitalName) + .orderBy("vital_value") + .findList(); + + List patientEncounterVitals = patientEncounterVitalRepository.find(q); + + + +/* + select t0.id c0, t0.user_id c1, t0.patient_encounter_id c2, t0.vital_value c3, t0.date_taken c4, + t1.id c5, t1.name c6, t1.data_type c7, t1.unit_of_measurement c8, t1.isDeleted c9 + from patient_encounter_vitals t0 + left outer join vitals as t1 on t1.id = t0.vital_id + left join patient_prescriptions as t2 on t2.encounter_id = t0.patient_encounter_id + where t0.date_taken > '2014-10-24 00:00:00' + and t0.date_taken < '2014-11-05 11:59:59' + and t1.name = 'temperature' + and t2.medication_id = 1 + order by vital_value + + select t0.id c0, t0.user_id c1, t0.patient_encounter_id c2, t0.vital_value c3, t0.date_taken c4 + from patient_encounter_vitals t0 + left outer join vitals t1 on t1.id = t0.vital_id + where t0.date_taken > ? + and t0.date_taken < ? + and t1.name = ? + order by vital_value +*/ + + + String unitOfMeasurement = ""; + for (IPatientEncounterVital eVital : patientEncounterVitals) { + + if( unitOfMeasurement.isEmpty() ) { + unitOfMeasurement = eVital.getVital().getUnitOfMeasurement(); + } + + Float vitalValue = eVital.getVitalValue(); + if( vitalValue >= filters.getRangeStart() && vitalValue <= filters.getRangeEnd() ) { + + resultItems.put( + eVital.getPatientEncounterId(), + vitalValue + ); + } + + } + + resultObj.setDataType(vitalName); + resultObj.setUnitOfMeasurement(unitOfMeasurement); + resultObj.setDataset(resultItems); + + return resultObj; + } + + /** + * {@inheritDoc} + */ + public ResearchResult getPatientAttribute(String attributeName, ResearchFilterItem filters) { + + String startDateString = filters.getStartDate(); + String endDateString = filters.getEndDate(); + Integer medicationID = filters.getMedicationId(); + + ResearchResult resultObj = new ResearchResult(); + Map resultItems = new HashMap<>(); + Map resultMap = new HashMap<>(); + + Date startDateObj; + Date endDateObj; + SimpleDateFormat sqlFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + try { + + // Set Start Date to start of day + String startParseDate = startDateString + " 00:00:00"; + startDateObj = sqlFormat.parse(startParseDate); + + // Set End Date to end of day + String parseEndDate = endDateString + " 23:59:59"; + endDateObj = sqlFormat.parse(parseEndDate); + + } + catch(ParseException e){ + + startDateObj = new Date(); + endDateObj = new Date(); + } + + // Get patients that had an encounter between startDate and endDate + // using dateOfTriageVisit for now -- might want to also check dateOfMedicalVisit & dateOfPharmacyVisit + Query q = QueryProvider.getPatientEncounterQuery(); + + if( medicationID > 0 ) { + + Query pQ = QueryProvider.getPatientPrescriptionQuery(); + + pQ.fetch("patientEncounter").where().eq("medication.id", medicationID); + List patientPrescriptions = prescriptionRepository.find(pQ); + + List scriptEncounterIds = new ArrayList<>(); + int i = 0; + for (IPatientPrescription script : patientPrescriptions) { + + scriptEncounterIds.add(script.getPatientEncounter().getId()); + } + + q.where().in("id", scriptEncounterIds); + } + + q.fetch("patient") + .where() + .gt("dateOfTriageVisit", sqlFormat.format(startDateObj)) + .lt("dateOfTriageVisit", sqlFormat.format(endDateObj)) + .orderBy("id") + .findList(); + + List encounters = patientEncounterRepository.find(q); + + String unitOfMeasurement = ""; + switch (attributeName) { + + case "age": + + unitOfMeasurement = "years"; + for (IPatientEncounter encounter : encounters) { + IPatient patient = encounter.getPatient(); + + Float age = (float) Math.floor(dateUtils.getAgeFloat(patient.getAge())); + + if( age >= filters.getRangeStart() && age <= filters.getRangeEnd() ) { + + resultItems.put( + encounter.getId(), + age + ); + } + } + break; + + case "gender": + + resultMap.put(0.0f, "Male"); + resultMap.put(1.0f, "Female"); + resultMap.put(2.0f, "N/A"); + + for (IPatientEncounter encounter : encounters) { + IPatient patient = encounter.getPatient(); + + float gender = -1; + // Do case in-sensitve comparison to be safe + //1 = female + //0 = male + //2 = no sex + if (patient.getSex() == null){ + gender = 2; + }else if (patient.getSex().matches("(?i:Male)")) { + gender = 0; + } else if (patient.getSex().matches("(?i:Female)")) { + gender = 1; + } + resultItems.put( + encounter.getId(), + gender + ); + } + break; + + case "pregnancyStatus": + + for (IPatientEncounter encounter : encounters) { + + resultMap.put(0.0f, "No"); + resultMap.put(1.0f, "Yes"); + + Integer wksPregnant = encounter.getWeeksPregnant(); + if (wksPregnant == null) wksPregnant = 0; + float pregnancyStatus = 0; + if (wksPregnant > 0) { + pregnancyStatus = 1; + } + resultItems.put( + encounter.getId(), + pregnancyStatus + ); + } + break; + + case "pregnancyTime": + + unitOfMeasurement = "weeks"; + for (IPatientEncounter encounter : encounters) { + + Integer weeksPregnant = encounter.getWeeksPregnant(); + if (weeksPregnant == null) weeksPregnant = 0; + + if( weeksPregnant >= filters.getRangeStart() && weeksPregnant <= filters.getRangeEnd() ) { + + resultItems.put( + encounter.getId(), + (float) weeksPregnant + ); + } + } + break; + } + + + resultObj.setDataType(attributeName); + resultObj.setUnitOfMeasurement(unitOfMeasurement); + resultObj.setDataset(resultItems); + resultObj.setValueMap(resultMap); + + return resultObj; + } + + + public ResearchResult getPatientHeights(ResearchFilterItem filters){ + + String startDateString = filters.getStartDate(); + String endDateString = filters.getEndDate(); + Integer medicationID = filters.getMedicationId(); + + ResearchResult resultObj = new ResearchResult(); + Map buildItems = new HashMap<>(); + + Date startDateObj; + Date endDateObj; + SimpleDateFormat sqlFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + try { + + // Set Start Date to start of day + String startParseDate = startDateString + " 00:00:00"; + startDateObj = sqlFormat.parse(startParseDate); + + // Set End Date to end of day + String parseEndDate = endDateString + " 23:59:59"; + endDateObj = sqlFormat.parse(parseEndDate); + + } + catch(ParseException e){ + + startDateObj = new Date(); + endDateObj = new Date(); + } + + + Query q = QueryProvider.getPatientEncounterVitalQuery(); + + List scriptEncounterIds = new ArrayList<>(); + if( medicationID > 0 ) { + + Query pQ = QueryProvider.getPatientPrescriptionQuery(); + + pQ.fetch("patientEncounter").where().eq("medication.id", medicationID); + List patientPrescriptions = prescriptionRepository.find(pQ); + + int i = 0; + for (IPatientPrescription script : patientPrescriptions) { + + scriptEncounterIds.add(script.getPatientEncounter().getId()); + } + + q.where().in("patientEncounterId", scriptEncounterIds); + } + + q.fetch("vital") + .where() + .gt("dateTaken", sqlFormat.format(startDateObj)) + .lt("dateTaken", sqlFormat.format(endDateObj)) + .eq("vital.name", "heightFeet") + .orderBy("patient_encounter_id") + .findList(); + List patientFeet = patientEncounterVitalRepository.find(q); + + q = QueryProvider.getPatientEncounterVitalQuery(); + + if( medicationID > 0 && scriptEncounterIds.size() > 0 ) { + + q.where().in("patientEncounterId", scriptEncounterIds); + } + q.fetch("vital") + .where() + .gt("dateTaken", sqlFormat.format(startDateObj)) + .lt("dateTaken", sqlFormat.format(endDateObj)) + .eq("vital.name", "heightInches") + .orderBy("patient_encounter_id") + .findList(); + List patientInches = patientEncounterVitalRepository.find(q); + + //Map researchItems = new HashMap<>(); + // Convert feet to inches + String unitOfMeasurement = "feet/inches"; + for (IPatientEncounterVital eVital : patientFeet) { + + float heightInches = 12 * eVital.getVitalValue(); + buildItems.put( + eVital.getPatientEncounterId(), + heightInches + ); + + } + + for(IPatientEncounterVital eVital : patientInches){ + + if( buildItems.containsKey(eVital.getPatientEncounterId()) ){ + + float heightInches = buildItems.get(eVital.getPatientEncounterId()); + heightInches = heightInches + eVital.getVitalValue(); + buildItems.put(eVital.getPatientEncounterId(), heightInches); + } + } + + Map resultItems = new HashMap<>(); + for( Integer key : buildItems.keySet() ){ + + Float value = buildItems.get(key); + if( value >= filters.getRangeStart() && value <= filters.getRangeEnd() ){ + + resultItems.put(key, value); + } + + } + + resultObj.setDataType("height"); + resultObj.setUnitOfMeasurement(unitOfMeasurement); + resultObj.setDataset(resultItems); + + return resultObj; + + } + + + + + public ResearchResult getPrescribedMedications(ResearchFilterItem filters){ + + String startDateString = filters.getStartDate(); + String endDateString = filters.getEndDate(); + + ResearchResult resultObj = new ResearchResult(); + Map resultItems = new HashMap<>(); + Map resultMap = new HashMap<>(); + + Date startDateObj; + Date endDateObj; + SimpleDateFormat sqlFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + try { + + // Set Start Date to start of day + String startParseDate = startDateString + " 00:00:00"; + startDateObj = sqlFormat.parse(startParseDate); + + // Set End Date to end of day + String parseEndDate = endDateString + " 23:59:59"; + endDateObj = sqlFormat.parse(parseEndDate); + + } + catch(ParseException e){ + + startDateObj = new Date(); + endDateObj = new Date(); + } + + + Query q = QueryProvider.getPatientPrescriptionQuery(); + q.fetch("medication") + .where() + .gt("dateTaken", sqlFormat.format(startDateObj)) + .lt("dateTaken", sqlFormat.format(endDateObj)) + .findList(); + + List patientMedication = prescriptionRepository.find(q); + + String unitOfMeasurement = ""; + for (IPatientPrescription prescription : patientMedication) { + + Integer key = prescription.getMedication().getId(); + + // Build prescription name map + if( !resultMap.containsKey((float)key) ){ + + resultMap.put((float)key, prescription.getMedication().getName()); + } + + Float count = 1.0f; + if( resultItems.containsKey(key) ){ + + count = resultItems.get(key) + 1.0f; + } + resultItems.put( + key, + count + ); + + } + + resultObj.setDataType("prescribedMeds"); + resultObj.setUnitOfMeasurement(unitOfMeasurement); + resultObj.setDataset(resultItems); + resultObj.setValueMap(resultMap); + + return resultObj; + } + + + // @TODO - need to make this work correctly + // want Medication Name (xAxis) vs Total Dispensed (yAxis) + // Need to tweak some things, this is different than # of patients + public ResearchResult getDispensedMedications(ResearchFilterItem filters){ + + String startDateString = filters.getStartDate(); + String endDateString = filters.getEndDate(); + + ResearchResult resultObj = new ResearchResult(); + Map resultItems = new HashMap<>(); + Map resultMap = new HashMap<>(); + + Date startDateObj; + Date endDateObj; + SimpleDateFormat sqlFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + try { + + // Set Start Date to start of day + String startParseDate = startDateString + " 00:00:00"; + startDateObj = sqlFormat.parse(startParseDate); + + // Set End Date to end of day + String parseEndDate = endDateString + " 23:59:59"; + endDateObj = sqlFormat.parse(parseEndDate); + + } + catch(ParseException e){ + + startDateObj = new Date(); + endDateObj = new Date(); + } + + Query q = QueryProvider.getPatientPrescriptionQuery(); + q.fetch("medication") + .where() + .gt("dateTaken", sqlFormat.format(startDateObj)) + .lt("dateTaken", sqlFormat.format(endDateObj)) + .findList(); + + List patientMedication = prescriptionRepository.find(q); + + String unitOfMeasurement = ""; + for (IPatientPrescription prescription : patientMedication) { + + Integer key = prescription.getMedication().getId(); + + // Build prescription name map + if( !resultMap.containsKey((float)key) ){ + + resultMap.put((float)key, prescription.getMedication().getName()); + } + + Float count = (float)prescription.getAmount(); + if( resultItems.containsKey(key) ){ + + count = resultItems.get(key) + count; + } + resultItems.put( + key, + count + ); + + } + + resultObj.setDataType("dispensedMeds"); + resultObj.setUnitOfMeasurement(unitOfMeasurement); + resultObj.setDataset(resultItems); + resultObj.setValueMap(resultMap); + + return resultObj; + + } + +} + + + +// Sorts Strings in format "float - float" by using the first float of the string +class GroupedCompare implements Comparator{ + + @Override + public int compare(String s1, String s2){ + + String[] s1Matches = s1.split("-"); + String s1First; + Float s1Val = 0.0f; + if( s1Matches.length > 1 ) { + s1First = s1Matches[0]; + } + else{ + s1First = s1; + } + s1Val = Float.parseFloat(s1First); + + String[] s2Matches = s2.split("-"); + String s2First; + Float s2Val = 0.0f; + if( s2Matches.length > 1 ) { + s2First = s2Matches[0]; + } + else{ + s2First = s2; + } + s2Val = Float.parseFloat(s2First); + + if( s1Val < s2Val ){ + + return -1; + } + else if( s1Val > s2Val ){ + + return 1; + } + return 0; + } +} diff --git a/app/femr/business/services/RoleService.java b/app/femr/business/services/system/RoleService.java similarity index 92% rename from app/femr/business/services/RoleService.java rename to app/femr/business/services/system/RoleService.java index ef952c665..2f358654f 100644 --- a/app/femr/business/services/RoleService.java +++ b/app/femr/business/services/system/RoleService.java @@ -16,15 +16,16 @@ along with fEMR. If not, see . If you have any questions, contact . */ -package femr.business.services; +package femr.business.services.system; import com.avaje.ebean.ExpressionList; import com.google.inject.Inject; import femr.business.helpers.QueryProvider; -import femr.common.dto.ServiceResponse; -import femr.data.models.IRole; +import femr.business.services.core.IRoleService; +import femr.common.dtos.ServiceResponse; +import femr.data.models.core.IRole; import femr.data.daos.IRepository; -import femr.data.models.Role; +import femr.data.models.mysql.Role; import java.util.ArrayList; import java.util.List; diff --git a/app/femr/business/services/SearchService.java b/app/femr/business/services/system/SearchService.java similarity index 89% rename from app/femr/business/services/SearchService.java rename to app/femr/business/services/system/SearchService.java index 6ae0f03c9..88485ab6c 100644 --- a/app/femr/business/services/SearchService.java +++ b/app/femr/business/services/system/SearchService.java @@ -16,7 +16,7 @@ along with fEMR. If not, see . If you have any questions, contact . */ -package femr.business.services; +package femr.business.services.system; import com.avaje.ebean.Expr; import com.avaje.ebean.ExpressionList; @@ -25,10 +25,12 @@ import femr.business.helpers.DomainMapper; import femr.business.helpers.QueryHelper; import femr.business.helpers.QueryProvider; -import femr.common.dto.ServiceResponse; +import femr.business.services.core.ISearchService; +import femr.common.dtos.ServiceResponse; import femr.common.models.*; import femr.data.daos.IRepository; -import femr.data.models.*; +import femr.data.models.core.*; +import femr.data.models.mysql.*; import femr.util.DataStructure.Mapping.TabFieldMultiMap; import femr.util.DataStructure.Mapping.VitalMultiMap; import femr.util.stringhelpers.StringUtils; @@ -36,6 +38,8 @@ import java.util.*; public class SearchService implements ISearchService { + + private final IRepository diagnosisRepository; private final IRepository medicationRepository; private final IRepository patientRepository; private final IRepository patientEncounterRepository; @@ -48,7 +52,8 @@ public class SearchService implements ISearchService { private final DomainMapper domainMapper; @Inject - public SearchService(IRepository medicationRepository, + public SearchService(IRepository diagnosisRepository, + IRepository medicationRepository, IRepository patientRepository, IRepository patientEncounterRepository, IRepository patientEncounterTabFieldRepository, @@ -59,6 +64,7 @@ public SearchService(IRepository medicationRepository, IRepository tabFieldRepository, DomainMapper domainMapper) { + this.diagnosisRepository = diagnosisRepository; this.medicationRepository = medicationRepository; this.patientRepository = patientRepository; this.patientEncounterRepository = patientEncounterRepository; @@ -243,6 +249,8 @@ public ServiceResponse> findUnreplacedPrescriptionItems(i PrescriptionItem prescriptionItem = new PrescriptionItem(); prescriptionItem.setName(pp.getMedication().getName()); prescriptionItem.setId(pp.getId()); + prescriptionItem.setPrescriberFirstName(pp.getPhysician().getFirstName()); + prescriptionItem.setPrescriberLastName(pp.getPhysician().getLastName()); prescriptionItems.add(prescriptionItem); } @@ -520,5 +528,64 @@ public ServiceResponse> getCustomFieldList() { return response; } + /** + * {@inheritDoc} + */ + @Override + public ServiceResponse> findPatientsForSearch() { + ServiceResponse> response = new ServiceResponse<>(); + + try { + List allPatients = patientRepository.findAll(Patient.class); + List patientItems = new ArrayList<>(); + for (IPatient allPatient : allPatients) { + + PatientItem currPatient = DomainMapper.createPatientItem(allPatient, null, null, null, null); + + if (allPatient.getPhoto() != null) { + currPatient.setPathToPhoto("/photo/patient/" + currPatient.getId() + "?showDefault=false"); + } else { + // If no photo for patient, show default + currPatient.setPathToPhoto("/photo/patient/" + currPatient.getId() + "?showDefault=true"); + } + + patientItems.add(currPatient); + + } + + + response.setResponseObject(patientItems); + + } catch (Exception ex) { + response.addError("exception", ex.getMessage()); + } + return response; + } + + /** + * {@inheritDoc} + */ + @Override + public ServiceResponse> findDiagnosisForSearch() { + + ServiceResponse> response = new ServiceResponse<>(); + try { + + List allDiagnoses = diagnosisRepository.findAll(Diagnosis.class); + List diagnoses = new ArrayList<>(); + + for (IDiagnosis d : allDiagnoses){ + if (StringUtils.isNotNullOrWhiteSpace(d.getName())) + diagnoses.add(d.getName()); + } + + response.setResponseObject(diagnoses); + + } catch (Exception ex) { + response.addError("", ex.getMessage()); + } + + return response; + } } diff --git a/app/femr/business/services/SessionService.java b/app/femr/business/services/system/SessionService.java similarity index 92% rename from app/femr/business/services/SessionService.java rename to app/femr/business/services/system/SessionService.java index f9c946d17..bd40a74d4 100644 --- a/app/femr/business/services/SessionService.java +++ b/app/femr/business/services/system/SessionService.java @@ -16,13 +16,15 @@ along with fEMR. If not, see . If you have any questions, contact . */ -package femr.business.services; +package femr.business.services.system; import com.google.inject.Inject; -import femr.common.dto.CurrentUser; -import femr.common.dto.ServiceResponse; +import femr.business.services.core.ISessionService; +import femr.business.services.core.IUserService; +import femr.common.dtos.CurrentUser; +import femr.common.dtos.ServiceResponse; import femr.business.wrappers.sessions.ISessionHelper; -import femr.data.models.IUser; +import femr.data.models.core.IUser; import femr.data.daos.IRepository; import femr.util.encryptions.IPasswordEncryptor; diff --git a/app/femr/business/services/UserService.java b/app/femr/business/services/system/UserService.java similarity index 96% rename from app/femr/business/services/UserService.java rename to app/femr/business/services/system/UserService.java index e6f2d7b3b..c07583428 100644 --- a/app/femr/business/services/UserService.java +++ b/app/femr/business/services/system/UserService.java @@ -16,19 +16,20 @@ along with fEMR. If not, see . If you have any questions, contact . */ -package femr.business.services; +package femr.business.services.system; import com.avaje.ebean.ExpressionList; import com.google.inject.Inject; import femr.business.helpers.DomainMapper; import femr.business.helpers.QueryProvider; -import femr.common.dto.ServiceResponse; +import femr.business.services.core.IUserService; +import femr.common.dtos.ServiceResponse; import femr.common.models.UserItem; -import femr.data.models.IRole; -import femr.data.models.IUser; +import femr.data.models.core.IRole; +import femr.data.models.core.IUser; import femr.data.daos.IRepository; -import femr.data.models.Role; -import femr.data.models.User; +import femr.data.models.mysql.Role; +import femr.data.models.mysql.User; import femr.util.encryptions.IPasswordEncryptor; import femr.util.stringhelpers.StringUtils; diff --git a/app/femr/business/services/system/VitalService.java b/app/femr/business/services/system/VitalService.java new file mode 100644 index 000000000..46fda14c1 --- /dev/null +++ b/app/femr/business/services/system/VitalService.java @@ -0,0 +1,157 @@ +/* + fEMR - fast Electronic Medical Records + Copyright (C) 2014 Team fEMR + + fEMR is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + fEMR is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with fEMR. If not, see . If + you have any questions, contact . +*/ +package femr.business.services.system; + +import com.avaje.ebean.ExpressionList; +import com.google.inject.Inject; +import femr.business.helpers.DomainMapper; +import femr.business.helpers.QueryProvider; +import femr.business.services.core.IVitalService; +import femr.common.dtos.ServiceResponse; +import femr.common.models.VitalItem; +import femr.data.daos.IRepository; +import femr.data.models.core.IPatientEncounterVital; +import femr.data.models.core.IVital; +import femr.data.models.mysql.Vital; +import femr.util.calculations.dateUtils; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +public class VitalService implements IVitalService { + + private final IRepository patientEncounterVitalRepository; + private final IRepository vitalRepository; + private final DomainMapper domainMapper; + + @Inject + public VitalService(IRepository patientEncounterVitalRepository, + IRepository vitalRepository, + DomainMapper domainMapper){ + + this.patientEncounterVitalRepository = patientEncounterVitalRepository; + this.vitalRepository = vitalRepository; + this.domainMapper = domainMapper; + } + + /** + * {@inheritDoc} + */ + @Override + public ServiceResponse> createPatientEncounterVitals(Map patientEncounterVitalMap, int userId, int encounterId) { + ServiceResponse> response = new ServiceResponse<>(); + if (patientEncounterVitalMap == null || userId < 1 || encounterId < 1) { + response.addError("", "invalid parameters"); + return response; + } + List patientEncounterVitals = new ArrayList<>(); + IPatientEncounterVital patientEncounterVital; + IVital vital; + + ExpressionList query; + String currentTime = dateUtils.getCurrentDateTimeString(); + + for (String key : patientEncounterVitalMap.keySet()) { + if (patientEncounterVitalMap.get(key) != null) { + + query = QueryProvider.getVitalQuery().where().eq("name", key); + vital = vitalRepository.findOne(query); + patientEncounterVitals.add(domainMapper.createPatientEncounterVital(encounterId, userId, currentTime, vital, patientEncounterVitalMap.get(key))); + } + } + + try { + List vitalItems = new ArrayList<>(); + List newPatientEncounterVitals = patientEncounterVitalRepository.createAll(patientEncounterVitals); + for (IPatientEncounterVital pev : newPatientEncounterVitals) { + vitalItems.add(DomainMapper.createVitalItem(pev)); + } + response.setResponseObject(vitalItems); + } catch (Exception ex) { + response.addError("exception", ex.getMessage()); + } + + return response; + } + + /** + * {@inheritDoc} + */ + @Override + public ServiceResponse> findAllVitalItems() { + ServiceResponse> response = new ServiceResponse<>(); + + try { + List vitals = vitalRepository.findAll(Vital.class); + List vitalItems = new ArrayList<>(); + for (IVital v : vitals) { + vitalItems.add(DomainMapper.createVitalItem(v)); + } + response.setResponseObject(vitalItems); + } catch (Exception ex) { + response.addError("exception", ex.getMessage()); + } + + return response; + } + + /** + * {@inheritDoc} + */ + @Override + public ServiceResponse> createPatientEncounterVitalItems(Map patientEncounterVitalMap, int userId, int encounterId) { + ServiceResponse> response = new ServiceResponse<>(); + if (patientEncounterVitalMap == null || userId < 1 || encounterId < 1) { + response.addError("", "bad parameters"); + return response; + } + + List patientEncounterVitals = new ArrayList<>(); + IPatientEncounterVital patientEncounterVital; + IVital vital; + + ExpressionList query; + String currentTime = dateUtils.getCurrentDateTimeString(); + + try { + + + for (String key : patientEncounterVitalMap.keySet()) { + if (patientEncounterVitalMap.get(key) != null) { + + query = QueryProvider.getVitalQuery().where().eq("name", key); + vital = vitalRepository.findOne(query); + patientEncounterVitals.add(domainMapper.createPatientEncounterVital(encounterId, userId, currentTime, vital, patientEncounterVitalMap.get(key))); + } + } + + List newPatientEncounterVitals = patientEncounterVitalRepository.createAll(patientEncounterVitals); + List vitalItems = new ArrayList<>(); + for (IPatientEncounterVital pev : patientEncounterVitals) { + vitalItems.add(DomainMapper.createVitalItem(pev)); + } + + response.setResponseObject(vitalItems); + } catch (Exception ex) { + response.addError("exception", ex.getMessage()); + } + + return response; + } +} diff --git a/app/femr/common/dto/CurrentUser.java b/app/femr/common/dtos/CurrentUser.java similarity index 96% rename from app/femr/common/dto/CurrentUser.java rename to app/femr/common/dtos/CurrentUser.java index 265d3b697..cea42bb3e 100644 --- a/app/femr/common/dto/CurrentUser.java +++ b/app/femr/common/dtos/CurrentUser.java @@ -16,9 +16,9 @@ along with fEMR. If not, see . If you have any questions, contact . */ -package femr.common.dto; +package femr.common.dtos; -import femr.data.models.IRole; +import femr.data.models.core.IRole; import java.util.List; diff --git a/app/femr/common/dto/ServiceResponse.java b/app/femr/common/dtos/ServiceResponse.java similarity index 98% rename from app/femr/common/dto/ServiceResponse.java rename to app/femr/common/dtos/ServiceResponse.java index 3fa5ce6f3..925b8d472 100644 --- a/app/femr/common/dto/ServiceResponse.java +++ b/app/femr/common/dtos/ServiceResponse.java @@ -16,7 +16,7 @@ along with fEMR. If not, see . If you have any questions, contact . */ -package femr.common.dto; +package femr.common.dtos; import java.util.HashMap; import java.util.Map; diff --git a/app/femr/common/models/CityItem.java b/app/femr/common/models/CityItem.java new file mode 100644 index 000000000..1da6232b3 --- /dev/null +++ b/app/femr/common/models/CityItem.java @@ -0,0 +1,41 @@ +/* + fEMR - fast Electronic Medical Records + Copyright (C) 2014 Team fEMR + + fEMR is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + fEMR is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with fEMR. If not, see . If + you have any questions, contact . +*/ +package femr.common.models; + +public class CityItem { + + private String cityName; + private String countryName; + + public String getCityName() { + return cityName; + } + + public void setCityName(String cityName) { + this.cityName = cityName; + } + + public String getCountryName() { + return countryName; + } + + public void setCountryName(String countryName) { + this.countryName = countryName; + } +} diff --git a/app/femr/common/models/MissionItem.java b/app/femr/common/models/MissionItem.java new file mode 100644 index 000000000..a0e97c0f0 --- /dev/null +++ b/app/femr/common/models/MissionItem.java @@ -0,0 +1,143 @@ +package femr.common.models; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +public class MissionItem { + + private String teamName; + private String teamLocation; + private String teamDescription; + private List missionTrips; + + public MissionItem() { + this.missionTrips = new ArrayList<>(); + } + + public void addMissionTrip(int id, + String tripCity, + String tripCountry, + Date tripStartDate, + String friendlyTripStartDate, + Date tripEndDate, + String friendlyTripEndDate, + boolean isCurrent) { + + MissionTripItem missionTripItem = new MissionTripItem(); + missionTripItem.setId(id); + missionTripItem.setTripCity(tripCity); + missionTripItem.setTripCountry(tripCountry); + missionTripItem.setTripStartDate(tripStartDate); + missionTripItem.setFriendlyTripStartDate(friendlyTripStartDate); + missionTripItem.setTripEndDate(tripEndDate); + missionTripItem.setFriendlyTripEndDate(friendlyTripEndDate); + missionTripItem.setCurrent(isCurrent); + this.missionTrips.add(missionTripItem); + } + + public List getMissionTrips() { + return missionTrips; + } + + public String getTeamName() { + return teamName; + } + + public void setTeamName(String teamName) { + this.teamName = teamName; + } + + public String getTeamLocation() { + return teamLocation; + } + + public void setTeamLocation(String teamLocation) { + this.teamLocation = teamLocation; + } + + public String getTeamDescription() { + return teamDescription; + } + + public void setTeamDescription(String teamDescription) { + this.teamDescription = teamDescription; + } + + + public class MissionTripItem { + private int id; + private String tripCity; + private String tripCountry; + private Date tripStartDate; + private String friendlyTripStartDate; + private Date tripEndDate; + private String friendlyTripEndDate; + private boolean isCurrent; + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + public String getTripCity() { + return tripCity; + } + + public void setTripCity(String tripCity) { + this.tripCity = tripCity; + } + + public String getTripCountry() { + return tripCountry; + } + + public void setTripCountry(String tripCountry) { + this.tripCountry = tripCountry; + } + + public Date getTripStartDate() { + return tripStartDate; + } + + public void setTripStartDate(Date tripStartDate) { + this.tripStartDate = tripStartDate; + } + + public String getFriendlyTripStartDate() { + return friendlyTripStartDate; + } + + public void setFriendlyTripStartDate(String friendlyTripStartDate) { + this.friendlyTripStartDate = friendlyTripStartDate; + } + + public Date getTripEndDate() { + return tripEndDate; + } + + public void setTripEndDate(Date tripEndDate) { + this.tripEndDate = tripEndDate; + } + + public String getFriendlyTripEndDate() { + return friendlyTripEndDate; + } + + public void setFriendlyTripEndDate(String friendlyTripEndDate) { + this.friendlyTripEndDate = friendlyTripEndDate; + } + + public boolean isCurrent() { + return isCurrent; + } + + public void setCurrent(boolean isCurrent) { + this.isCurrent = isCurrent; + } + } + +} diff --git a/app/femr/common/models/PrescriptionItem.java b/app/femr/common/models/PrescriptionItem.java index 4804a6f46..3cfc8897e 100644 --- a/app/femr/common/models/PrescriptionItem.java +++ b/app/femr/common/models/PrescriptionItem.java @@ -22,7 +22,8 @@ public class PrescriptionItem { private int id; private String name; private Integer replacementId; - + private String prescriberFirstName; + private String prescriberLastName; public PrescriptionItem(String name){ this.name = name; @@ -55,4 +56,20 @@ public Integer getReplacementId() { public void setReplacementId(Integer replacementId) { this.replacementId = replacementId; } + + public String getPrescriberFirstName() { + return prescriberFirstName; + } + + public void setPrescriberFirstName(String prescriberFirstName) { + this.prescriberFirstName = prescriberFirstName; + } + + public String getPrescriberLastName() { + return prescriberLastName; + } + + public void setPrescriberLastName(String prescriberLastName) { + this.prescriberLastName = prescriberLastName; + } } diff --git a/app/femr/common/models/ResearchFilterItem.java b/app/femr/common/models/ResearchFilterItem.java new file mode 100644 index 000000000..1eeb9c8b2 --- /dev/null +++ b/app/femr/common/models/ResearchFilterItem.java @@ -0,0 +1,96 @@ +package femr.common.models; + + +public class ResearchFilterItem { + + private String primaryDataset; + private String secondaryDataset; + private String graphType; + private String startDate; + private String endDate; + private boolean groupPrimary; + private Integer groupFactor; + private Float rangeStart; + private Float rangeEnd; + private Integer medicationId; + + public String getPrimaryDataset() { + return primaryDataset; + } + + public void setPrimaryDataset(String primaryDataset) { + this.primaryDataset = primaryDataset; + } + + public String getSecondaryDataset() { + return secondaryDataset; + } + + public void setSecondaryDataset(String secondaryDataset) { + this.secondaryDataset = secondaryDataset; + } + + public String getGraphType() { + return graphType; + } + + public void setGraphType(String graphType) { + this.graphType = graphType; + } + + public String getStartDate() { + return startDate; + } + + public void setStartDate(String startDate) { + this.startDate = startDate; + } + + public String getEndDate() { + return endDate; + } + + public void setEndDate(String endDate) { + this.endDate = endDate; + } + + public boolean isGroupPrimary() { return groupPrimary; } + + public void setGroupPrimary(boolean groupPrimary) { this.groupPrimary = groupPrimary; } + + public Integer getGroupFactor() { return groupFactor; } + + public void setGroupFactor(Integer groupFactor) { this.groupFactor = groupFactor; } + + public Float getRangeStart() { return rangeStart; } + + public void setRangeStart(Float rangeStart) { + + if (rangeStart == null) { + + this.rangeStart = Float.MIN_VALUE; + + } else { + + this.rangeStart = rangeStart; + } + } + + public Float getRangeEnd() { return rangeEnd; } + + public void setRangeEnd(Float rangeEnd) { + + if (rangeEnd == null) { + + this.rangeEnd = Float.MAX_VALUE; + + } else { + + this.rangeEnd = rangeEnd; + } + } + + public Integer getMedicationId() { return medicationId; } + + public void setMedicationId(Integer medicationId) { this.medicationId = medicationId; } +} diff --git a/app/femr/common/models/ResearchItem.java b/app/femr/common/models/ResearchItem.java new file mode 100644 index 000000000..4874504ea --- /dev/null +++ b/app/femr/common/models/ResearchItem.java @@ -0,0 +1,78 @@ +package femr.common.models; + +import java.util.HashMap; +import java.util.Map; + +/* + fEMR - fast Electronic Medical Records + Copyright (C) 2014 Team fEMR + + fEMR is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + fEMR is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with fEMR. If not, see . If + you have any questions, contact . +*/ +public class ResearchItem { + + + private String primaryName; + private float primaryValue; + private Map secondaryData; + + public ResearchItem(){ + + primaryName = ""; + primaryValue = 0.0f; + secondaryData = new HashMap<>(); + } + + public ResearchItem(String name){ + + primaryName = name; + primaryValue = 0.0f; + secondaryData = new HashMap<>(); + } + + public String getPrimaryName() { + return primaryName; + } + + + public void setPrimaryName(String primaryName) { + this.primaryName = primaryName; + } + + public float getPrimaryValue() { + return primaryValue; + } + + public void setPrimaryValue(float primaryValue) { + this.primaryValue = primaryValue; + } + + + public Map getSecondaryData() { + + if( secondaryData != null ) { + return secondaryData; + } + else{ + return new HashMap(); + } + } + + public void setSecondaryData(Map secondaryData) { + this.secondaryData = secondaryData; + } + +} + diff --git a/app/femr/common/models/ResearchResult.java b/app/femr/common/models/ResearchResult.java new file mode 100644 index 000000000..ccb076c60 --- /dev/null +++ b/app/femr/common/models/ResearchResult.java @@ -0,0 +1,52 @@ +package femr.common.models; + + +import java.util.HashMap; +import java.util.Map; + +public class ResearchResult { + + private String dataType; + private String unitOfMeasurement; + private Map dataset; + + // Used for non-number items - map float to String + private Map valueMap; + + public String getDataType() { + return dataType; + } + + public void setDataType(String dataType) { + this.dataType = dataType; + } + + public String getUnitOfMeasurement() { + return unitOfMeasurement; + } + + public void setUnitOfMeasurement(String unitOfMeasurement) { + this.unitOfMeasurement = unitOfMeasurement; + } + + public Map getDataset() { + + if( dataset == null ){ + + return new HashMap(); + } + return dataset; + } + + public void setDataset(Map dataset) { + this.dataset = dataset; + } + + public Map getValueMap() { + return valueMap; + } + + public void setValueMap(Map valueMap) { + this.valueMap = valueMap; + } +} diff --git a/app/femr/common/models/TeamItem.java b/app/femr/common/models/TeamItem.java new file mode 100644 index 000000000..3e85e9cfb --- /dev/null +++ b/app/femr/common/models/TeamItem.java @@ -0,0 +1,31 @@ +package femr.common.models; + +public class TeamItem { + private String name; + private String description; + private String location; + + 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 String getLocation() { + return location; + } + + public void setLocation(String location) { + this.location = location; + } +} diff --git a/app/femr/common/models/TripItem.java b/app/femr/common/models/TripItem.java new file mode 100644 index 000000000..3d592b21f --- /dev/null +++ b/app/femr/common/models/TripItem.java @@ -0,0 +1,51 @@ +package femr.common.models; + +import java.util.Date; + +public class TripItem { + private String teamName; + private String tripCity; + private String tripCountry; + private Date tripStartDate; + private Date tripEndDate; + + public String getTeamName() { + return teamName; + } + + public void setTeamName(String teamName) { + this.teamName = teamName; + } + + public String getTripCity() { + return tripCity; + } + + public void setTripCity(String tripCity) { + this.tripCity = tripCity; + } + + public String getTripCountry() { + return tripCountry; + } + + public void setTripCountry(String tripCountry) { + this.tripCountry = tripCountry; + } + + public Date getTripStartDate() { + return tripStartDate; + } + + public void setTripStartDate(Date tripStartDate) { + this.tripStartDate = tripStartDate; + } + + public Date getTripEndDate() { + return tripEndDate; + } + + public void setTripEndDate(Date tripEndDate) { + this.tripEndDate = tripEndDate; + } +} diff --git a/app/femr/data/models/IChiefComplaint.java b/app/femr/data/models/core/IChiefComplaint.java similarity index 97% rename from app/femr/data/models/IChiefComplaint.java rename to app/femr/data/models/core/IChiefComplaint.java index 8015ba092..2e9683fa2 100644 --- a/app/femr/data/models/IChiefComplaint.java +++ b/app/femr/data/models/core/IChiefComplaint.java @@ -16,7 +16,7 @@ along with fEMR. If not, see . If you have any questions, contact . */ -package femr.data.models; +package femr.data.models.core; /** * Tracks chief complaints. Important when trying to diff --git a/app/femr/data/models/core/IDiagnosis.java b/app/femr/data/models/core/IDiagnosis.java new file mode 100644 index 000000000..1c1fe6286 --- /dev/null +++ b/app/femr/data/models/core/IDiagnosis.java @@ -0,0 +1,31 @@ +/* + fEMR - fast Electronic Medical Records + Copyright (C) 2014 Team fEMR + + fEMR is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + fEMR is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with fEMR. If not, see . If + you have any questions, contact . +*/ +package femr.data.models.core; + +public interface IDiagnosis { + + + int getId(); + + void setId(int id); + + String getName(); + + void setName(String name); +} diff --git a/app/femr/data/models/IMedication.java b/app/femr/data/models/core/IMedication.java similarity index 98% rename from app/femr/data/models/IMedication.java rename to app/femr/data/models/core/IMedication.java index 98e0d2c2b..e0dab6df8 100644 --- a/app/femr/data/models/IMedication.java +++ b/app/femr/data/models/core/IMedication.java @@ -16,7 +16,7 @@ along with fEMR. If not, see . If you have any questions, contact . */ -package femr.data.models; +package femr.data.models.core; import java.util.List; diff --git a/app/femr/data/models/IMedicationActiveDrug.java b/app/femr/data/models/core/IMedicationActiveDrug.java similarity index 97% rename from app/femr/data/models/IMedicationActiveDrug.java rename to app/femr/data/models/core/IMedicationActiveDrug.java index 05147f6c0..29751f96d 100644 --- a/app/femr/data/models/IMedicationActiveDrug.java +++ b/app/femr/data/models/core/IMedicationActiveDrug.java @@ -16,7 +16,7 @@ along with fEMR. If not, see . If you have any questions, contact . */ -package femr.data.models; +package femr.data.models.core; /** * MedicationActiveDrug represents the active ingredient inside a medication, diff --git a/app/femr/data/models/IMedicationActiveDrugName.java b/app/femr/data/models/core/IMedicationActiveDrugName.java similarity index 97% rename from app/femr/data/models/IMedicationActiveDrugName.java rename to app/femr/data/models/core/IMedicationActiveDrugName.java index b7d000c16..bd425a0b4 100644 --- a/app/femr/data/models/IMedicationActiveDrugName.java +++ b/app/femr/data/models/core/IMedicationActiveDrugName.java @@ -16,7 +16,7 @@ along with fEMR. If not, see . If you have any questions, contact . */ -package femr.data.models; +package femr.data.models.core; /** * MedicationActiveDrugName is the name of the active drug inside diff --git a/app/femr/data/models/IMedicationAdministration.java b/app/femr/data/models/core/IMedicationAdministration.java similarity index 97% rename from app/femr/data/models/IMedicationAdministration.java rename to app/femr/data/models/core/IMedicationAdministration.java index d8159a2a6..6b5518888 100644 --- a/app/femr/data/models/IMedicationAdministration.java +++ b/app/femr/data/models/core/IMedicationAdministration.java @@ -16,7 +16,7 @@ along with fEMR. If not, see . If you have any questions, contact . */ -package femr.data.models; +package femr.data.models.core; /** * MedicationAdministration represents the manner in which a medication diff --git a/app/femr/data/models/IMedicationForm.java b/app/femr/data/models/core/IMedicationForm.java similarity index 97% rename from app/femr/data/models/IMedicationForm.java rename to app/femr/data/models/core/IMedicationForm.java index 306daa97c..1409e4532 100644 --- a/app/femr/data/models/IMedicationForm.java +++ b/app/femr/data/models/core/IMedicationForm.java @@ -16,7 +16,7 @@ along with fEMR. If not, see . If you have any questions, contact . */ -package femr.data.models; +package femr.data.models.core; /** * MedicationForm represents the form of the medication diff --git a/app/femr/data/models/IMedicationMeasurementUnit.java b/app/femr/data/models/core/IMedicationMeasurementUnit.java similarity index 97% rename from app/femr/data/models/IMedicationMeasurementUnit.java rename to app/femr/data/models/core/IMedicationMeasurementUnit.java index aa164100f..1fd80a706 100644 --- a/app/femr/data/models/IMedicationMeasurementUnit.java +++ b/app/femr/data/models/core/IMedicationMeasurementUnit.java @@ -16,7 +16,7 @@ along with fEMR. If not, see . If you have any questions, contact . */ -package femr.data.models; +package femr.data.models.core; /** * MedicationMeasurementUnit represents the unit of diff --git a/app/femr/data/models/core/IMissionCity.java b/app/femr/data/models/core/IMissionCity.java new file mode 100644 index 000000000..6aedb8664 --- /dev/null +++ b/app/femr/data/models/core/IMissionCity.java @@ -0,0 +1,31 @@ +/* + fEMR - fast Electronic Medical Records + Copyright (C) 2014 Team fEMR + + fEMR is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + fEMR is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with fEMR. If not, see . If + you have any questions, contact . +*/ +package femr.data.models.core; + +public interface IMissionCity { + int getId(); + + String getName(); + + void setName(String name); + + IMissionCountry getMissionCountry(); + + void setMissionCountry(IMissionCountry missionCountry); +} diff --git a/app/femr/business/services/IResearchService.java b/app/femr/data/models/core/IMissionCountry.java similarity index 85% rename from app/femr/business/services/IResearchService.java rename to app/femr/data/models/core/IMissionCountry.java index 9c96346bd..0b8aa0968 100644 --- a/app/femr/business/services/IResearchService.java +++ b/app/femr/data/models/core/IMissionCountry.java @@ -16,17 +16,12 @@ along with fEMR. If not, see . If you have any questions, contact . */ -package femr.business.services; - - -/** - * Interface for the Research Service - */ -public interface IResearchService { - - - +package femr.data.models.core; +public interface IMissionCountry { + int getId(); + String getName(); + void setName(String name); } diff --git a/app/femr/data/models/core/IMissionTeam.java b/app/femr/data/models/core/IMissionTeam.java new file mode 100644 index 000000000..db8dc1371 --- /dev/null +++ b/app/femr/data/models/core/IMissionTeam.java @@ -0,0 +1,43 @@ +/* + fEMR - fast Electronic Medical Records + Copyright (C) 2014 Team fEMR + + fEMR is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + fEMR is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with fEMR. If not, see . If + you have any questions, contact . +*/ +package femr.data.models.core; + +import femr.data.models.mysql.MissionTrip; + +import java.util.List; + +public interface IMissionTeam { + int getId(); + + String getName(); + + void setName(String name); + + String getLocation(); + + void setLocation(String location); + + String getDescription(); + + void setDescription(String description); + + List getMissionTrips(); + + void setMissionTrips(List missionTrips); +} diff --git a/app/femr/data/models/core/IMissionTrip.java b/app/femr/data/models/core/IMissionTrip.java new file mode 100644 index 000000000..c3ed874c9 --- /dev/null +++ b/app/femr/data/models/core/IMissionTrip.java @@ -0,0 +1,45 @@ +/* + fEMR - fast Electronic Medical Records + Copyright (C) 2014 Team fEMR + + fEMR is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + fEMR is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with fEMR. If not, see . If + you have any questions, contact . +*/ +package femr.data.models.core; + +import java.util.Date; + +public interface IMissionTrip { + int getId(); + + IMissionTeam getMissionTeam(); + + void setMissionTeam(IMissionTeam missionTeam); + + IMissionCity getMissionCity(); + + void setMissionCity(IMissionCity missionCity); + + boolean isCurrent(); + + void setCurrent(boolean isCurrent); + + Date getStartDate(); + + void setStartDate(Date startDate); + + Date getEndDate(); + + void setEndDate(Date endDate); +} diff --git a/app/femr/data/models/IPatient.java b/app/femr/data/models/core/IPatient.java similarity index 97% rename from app/femr/data/models/IPatient.java rename to app/femr/data/models/core/IPatient.java index c1c7dd934..57dce9f24 100644 --- a/app/femr/data/models/IPatient.java +++ b/app/femr/data/models/core/IPatient.java @@ -16,7 +16,7 @@ along with fEMR. If not, see . If you have any questions, contact . */ -package femr.data.models; +package femr.data.models.core; import java.util.Date; diff --git a/app/femr/data/models/IPatientAgeClassification.java b/app/femr/data/models/core/IPatientAgeClassification.java similarity index 97% rename from app/femr/data/models/IPatientAgeClassification.java rename to app/femr/data/models/core/IPatientAgeClassification.java index 769d0e8d3..335b4ec64 100644 --- a/app/femr/data/models/IPatientAgeClassification.java +++ b/app/femr/data/models/core/IPatientAgeClassification.java @@ -16,7 +16,7 @@ along with fEMR. If not, see . If you have any questions, contact . */ -package femr.data.models; +package femr.data.models.core; /** * Represents one of the ways of guessing a patients "length of living". diff --git a/app/femr/data/models/IPatientEncounter.java b/app/femr/data/models/core/IPatientEncounter.java similarity index 93% rename from app/femr/data/models/IPatientEncounter.java rename to app/femr/data/models/core/IPatientEncounter.java index 93a44fc82..fc0a5a36e 100644 --- a/app/femr/data/models/IPatientEncounter.java +++ b/app/femr/data/models/core/IPatientEncounter.java @@ -16,7 +16,7 @@ along with fEMR. If not, see . If you have any questions, contact . */ -package femr.data.models; +package femr.data.models.core; import org.joda.time.DateTime; import java.util.List; @@ -63,4 +63,8 @@ public interface IPatientEncounter { IPatientAgeClassification getPatientAgeClassification(); void setPatientAgeClassification(IPatientAgeClassification patientAgeClassification); + + IMissionTrip getMissionTrip(); + + void setMissionTrip(IMissionTrip missionTrip); } diff --git a/app/femr/data/models/IPatientEncounterPhoto.java b/app/femr/data/models/core/IPatientEncounterPhoto.java similarity index 96% rename from app/femr/data/models/IPatientEncounterPhoto.java rename to app/femr/data/models/core/IPatientEncounterPhoto.java index 5a0b5003a..e229559d7 100644 --- a/app/femr/data/models/IPatientEncounterPhoto.java +++ b/app/femr/data/models/core/IPatientEncounterPhoto.java @@ -16,7 +16,7 @@ along with fEMR. If not, see . If you have any questions, contact . */ -package femr.data.models; +package femr.data.models.core; public interface IPatientEncounterPhoto { int getPatientEncounterId(); diff --git a/app/femr/data/models/IPatientEncounterTabField.java b/app/femr/data/models/core/IPatientEncounterTabField.java similarity index 94% rename from app/femr/data/models/IPatientEncounterTabField.java rename to app/femr/data/models/core/IPatientEncounterTabField.java index 2aa4053b5..35025c9c7 100644 --- a/app/femr/data/models/IPatientEncounterTabField.java +++ b/app/femr/data/models/core/IPatientEncounterTabField.java @@ -16,8 +16,9 @@ along with fEMR. If not, see . If you have any questions, contact . */ -package femr.data.models; +package femr.data.models.core; +import femr.data.models.mysql.ChiefComplaint; import org.joda.time.DateTime; /** diff --git a/app/femr/data/models/IPatientEncounterVital.java b/app/femr/data/models/core/IPatientEncounterVital.java similarity index 97% rename from app/femr/data/models/IPatientEncounterVital.java rename to app/femr/data/models/core/IPatientEncounterVital.java index 4954b9e85..8c2a30d56 100644 --- a/app/femr/data/models/IPatientEncounterVital.java +++ b/app/femr/data/models/core/IPatientEncounterVital.java @@ -16,7 +16,7 @@ along with fEMR. If not, see . If you have any questions, contact . */ -package femr.data.models; +package femr.data.models.core; public interface IPatientEncounterVital { int getId(); diff --git a/app/femr/data/models/IPatientPrescription.java b/app/femr/data/models/core/IPatientPrescription.java similarity index 98% rename from app/femr/data/models/IPatientPrescription.java rename to app/femr/data/models/core/IPatientPrescription.java index 3ca712f4b..8fb011291 100644 --- a/app/femr/data/models/IPatientPrescription.java +++ b/app/femr/data/models/core/IPatientPrescription.java @@ -16,7 +16,7 @@ along with fEMR. If not, see . If you have any questions, contact . */ -package femr.data.models; +package femr.data.models.core; import org.joda.time.DateTime; @@ -24,7 +24,6 @@ public interface IPatientPrescription { int getId(); - IMedication getMedication(); void setMedication(IMedication medication); diff --git a/app/femr/data/models/IPhoto.java b/app/femr/data/models/core/IPhoto.java similarity index 97% rename from app/femr/data/models/IPhoto.java rename to app/femr/data/models/core/IPhoto.java index 3206ccb99..3cbc0695a 100644 --- a/app/femr/data/models/IPhoto.java +++ b/app/femr/data/models/core/IPhoto.java @@ -17,7 +17,7 @@ you have any questions, contact . */ -package femr.data.models; +package femr.data.models.core; import java.util.Date; diff --git a/app/femr/data/models/IRole.java b/app/femr/data/models/core/IRole.java similarity index 96% rename from app/femr/data/models/IRole.java rename to app/femr/data/models/core/IRole.java index e5559c4cb..c5ee4c16d 100644 --- a/app/femr/data/models/IRole.java +++ b/app/femr/data/models/core/IRole.java @@ -16,7 +16,7 @@ along with fEMR. If not, see . If you have any questions, contact . */ -package femr.data.models; +package femr.data.models.core; /** * User roles - nurse, physician, pharmacist, researcher, etc diff --git a/app/femr/data/models/ISystemSetting.java b/app/femr/data/models/core/ISystemSetting.java similarity index 97% rename from app/femr/data/models/ISystemSetting.java rename to app/femr/data/models/core/ISystemSetting.java index 62704d1be..b8bc032a8 100644 --- a/app/femr/data/models/ISystemSetting.java +++ b/app/femr/data/models/core/ISystemSetting.java @@ -16,7 +16,7 @@ along with fEMR. If not, see . If you have any questions, contact . */ -package femr.data.models; +package femr.data.models.core; /** * Created by kevin on 7/28/14. diff --git a/app/femr/data/models/ITab.java b/app/femr/data/models/core/ITab.java similarity index 97% rename from app/femr/data/models/ITab.java rename to app/femr/data/models/core/ITab.java index c0ee62312..14d641b21 100644 --- a/app/femr/data/models/ITab.java +++ b/app/femr/data/models/core/ITab.java @@ -16,7 +16,7 @@ along with fEMR. If not, see . If you have any questions, contact . */ -package femr.data.models; +package femr.data.models.core; import org.joda.time.DateTime; diff --git a/app/femr/data/models/ITabField.java b/app/femr/data/models/core/ITabField.java similarity index 97% rename from app/femr/data/models/ITabField.java rename to app/femr/data/models/core/ITabField.java index acc9b8671..76bb4f5cf 100644 --- a/app/femr/data/models/ITabField.java +++ b/app/femr/data/models/core/ITabField.java @@ -16,7 +16,7 @@ along with fEMR. If not, see . If you have any questions, contact . */ -package femr.data.models; +package femr.data.models.core; public interface ITabField { int getId(); diff --git a/app/femr/data/models/ITabFieldSize.java b/app/femr/data/models/core/ITabFieldSize.java similarity index 96% rename from app/femr/data/models/ITabFieldSize.java rename to app/femr/data/models/core/ITabFieldSize.java index c5145907b..c026b4df2 100644 --- a/app/femr/data/models/ITabFieldSize.java +++ b/app/femr/data/models/core/ITabFieldSize.java @@ -16,7 +16,7 @@ along with fEMR. If not, see . If you have any questions, contact . */ -package femr.data.models; +package femr.data.models.core; /** * Used to identify a dynamic tab fields size diff --git a/app/femr/data/models/ITabFieldType.java b/app/femr/data/models/core/ITabFieldType.java similarity index 96% rename from app/femr/data/models/ITabFieldType.java rename to app/femr/data/models/core/ITabFieldType.java index 51fab913c..0cd0c959d 100644 --- a/app/femr/data/models/ITabFieldType.java +++ b/app/femr/data/models/core/ITabFieldType.java @@ -16,7 +16,7 @@ along with fEMR. If not, see . If you have any questions, contact . */ -package femr.data.models; +package femr.data.models.core; /** * Used to identify a tab fields type - number, text, etc diff --git a/app/femr/data/models/IUser.java b/app/femr/data/models/core/IUser.java similarity index 98% rename from app/femr/data/models/IUser.java rename to app/femr/data/models/core/IUser.java index 89d534958..498b8ec54 100644 --- a/app/femr/data/models/IUser.java +++ b/app/femr/data/models/core/IUser.java @@ -16,7 +16,7 @@ along with fEMR. If not, see . If you have any questions, contact . */ -package femr.data.models; +package femr.data.models.core; import org.joda.time.DateTime; diff --git a/app/femr/data/models/IVital.java b/app/femr/data/models/core/IVital.java similarity index 97% rename from app/femr/data/models/IVital.java rename to app/femr/data/models/core/IVital.java index b3a30a839..e71fd518a 100644 --- a/app/femr/data/models/IVital.java +++ b/app/femr/data/models/core/IVital.java @@ -16,7 +16,7 @@ along with fEMR. If not, see . If you have any questions, contact . */ -package femr.data.models; +package femr.data.models.core; public interface IVital { void setId(int id); diff --git a/app/femr/data/models/ChiefComplaint.java b/app/femr/data/models/mysql/ChiefComplaint.java similarity index 89% rename from app/femr/data/models/ChiefComplaint.java rename to app/femr/data/models/mysql/ChiefComplaint.java index a72b360d8..8290213da 100644 --- a/app/femr/data/models/ChiefComplaint.java +++ b/app/femr/data/models/mysql/ChiefComplaint.java @@ -16,13 +16,16 @@ along with fEMR. If not, see . If you have any questions, contact . */ -package femr.data.models; +package femr.data.models.mysql; + +import femr.data.models.core.IChiefComplaint; +import femr.data.models.core.IPatientEncounter; import javax.persistence.*; @Entity @Table(name = "chief_complaints") -public class ChiefComplaint implements IChiefComplaint{ +public class ChiefComplaint implements IChiefComplaint { @Id @Column(name = "id", unique = true, nullable = false) private int id; diff --git a/app/femr/data/models/mysql/Diagnosis.java b/app/femr/data/models/mysql/Diagnosis.java new file mode 100644 index 000000000..f97f2b92f --- /dev/null +++ b/app/femr/data/models/mysql/Diagnosis.java @@ -0,0 +1,54 @@ +/* + fEMR - fast Electronic Medical Records + Copyright (C) 2014 Team fEMR + + fEMR is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + fEMR is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with fEMR. If not, see . If + you have any questions, contact . +*/ +package femr.data.models.mysql; + +import femr.data.models.core.IDiagnosis; + +import javax.persistence.*; + +@Entity +@Table(name = "diagnoses") +public class Diagnosis implements IDiagnosis { + + @Id + @Column(name = "id", unique = true, nullable = false) + private int id; + @Column(name = "name", nullable = false) + private String name; + + @Override + public int getId() { + return id; + } + + @Override + public void setId(int id) { + this.id = id; + } + + @Override + public String getName() { + return name; + } + + @Override + public void setName(String name) { + this.name = name; + } +} diff --git a/app/femr/data/models/Medication.java b/app/femr/data/models/mysql/Medication.java similarity index 91% rename from app/femr/data/models/Medication.java rename to app/femr/data/models/mysql/Medication.java index 9de8cb8c8..743dc20c9 100644 --- a/app/femr/data/models/Medication.java +++ b/app/femr/data/models/mysql/Medication.java @@ -16,7 +16,11 @@ along with fEMR. If not, see . If you have any questions, contact . */ -package femr.data.models; +package femr.data.models.mysql; + +import femr.data.models.core.IMedication; +import femr.data.models.core.IMedicationActiveDrug; +import femr.data.models.core.IMedicationForm; import javax.persistence.*; import java.util.List; @@ -46,6 +50,11 @@ public class Medication implements IMedication { inverseJoinColumns = {@JoinColumn(name = "medication_active_drugs_id", referencedColumnName = "id")}) private List medicationActiveDrugs; + /*@ManyToOne(fetch = FetchType.EAGER, cascade = CascadeType.ALL) + @JoinColumn(name = "patient_encounters") + private PatientEncounter patientEncounter; +*/ + @Override public int getId() { return id; diff --git a/app/femr/data/models/MedicationActiveDrug.java b/app/femr/data/models/mysql/MedicationActiveDrug.java similarity index 93% rename from app/femr/data/models/MedicationActiveDrug.java rename to app/femr/data/models/mysql/MedicationActiveDrug.java index c742d8443..d7ed9a8c6 100644 --- a/app/femr/data/models/MedicationActiveDrug.java +++ b/app/femr/data/models/mysql/MedicationActiveDrug.java @@ -16,7 +16,11 @@ along with fEMR. If not, see . If you have any questions, contact . */ -package femr.data.models; +package femr.data.models.mysql; + +import femr.data.models.core.IMedicationActiveDrug; +import femr.data.models.core.IMedicationActiveDrugName; +import femr.data.models.core.IMedicationMeasurementUnit; import javax.persistence.*; diff --git a/app/femr/data/models/MedicationActiveDrugName.java b/app/femr/data/models/mysql/MedicationActiveDrugName.java similarity index 93% rename from app/femr/data/models/MedicationActiveDrugName.java rename to app/femr/data/models/mysql/MedicationActiveDrugName.java index 4895f9322..0c30191b1 100644 --- a/app/femr/data/models/MedicationActiveDrugName.java +++ b/app/femr/data/models/mysql/MedicationActiveDrugName.java @@ -16,7 +16,9 @@ along with fEMR. If not, see . If you have any questions, contact . */ -package femr.data.models; +package femr.data.models.mysql; + +import femr.data.models.core.IMedicationActiveDrugName; import javax.persistence.Column; import javax.persistence.Entity; @@ -25,7 +27,7 @@ @Entity @Table(name = "medication_active_drug_names") -public class MedicationActiveDrugName implements IMedicationActiveDrugName{ +public class MedicationActiveDrugName implements IMedicationActiveDrugName { @Id @Column(name = "id", unique = true, nullable = false) private int id; diff --git a/app/femr/data/models/MedicationAdministration.java b/app/femr/data/models/mysql/MedicationAdministration.java similarity index 93% rename from app/femr/data/models/MedicationAdministration.java rename to app/femr/data/models/mysql/MedicationAdministration.java index 10701d828..ec99ee4e2 100644 --- a/app/femr/data/models/MedicationAdministration.java +++ b/app/femr/data/models/mysql/MedicationAdministration.java @@ -16,7 +16,9 @@ along with fEMR. If not, see . If you have any questions, contact . */ -package femr.data.models; +package femr.data.models.mysql; + +import femr.data.models.core.IMedicationAdministration; import javax.persistence.Column; import javax.persistence.Entity; @@ -25,7 +27,7 @@ @Entity @Table(name = "medication_administrations") -public class MedicationAdministration implements IMedicationAdministration{ +public class MedicationAdministration implements IMedicationAdministration { @Id @Column(name = "id", unique = true, nullable = false) private int id; diff --git a/app/femr/data/models/MedicationForm.java b/app/femr/data/models/mysql/MedicationForm.java similarity index 93% rename from app/femr/data/models/MedicationForm.java rename to app/femr/data/models/mysql/MedicationForm.java index 855cee13d..df71f4da3 100644 --- a/app/femr/data/models/MedicationForm.java +++ b/app/femr/data/models/mysql/MedicationForm.java @@ -16,7 +16,9 @@ along with fEMR. If not, see . If you have any questions, contact . */ -package femr.data.models; +package femr.data.models.mysql; + +import femr.data.models.core.IMedicationForm; import javax.persistence.Column; import javax.persistence.Entity; @@ -25,7 +27,7 @@ @Entity @Table(name = "medication_forms") -public class MedicationForm implements IMedicationForm{ +public class MedicationForm implements IMedicationForm { @Id @Column(name = "id", unique = true, nullable = false) private int id; diff --git a/app/femr/data/models/MedicationMeasurementUnit.java b/app/femr/data/models/mysql/MedicationMeasurementUnit.java similarity index 94% rename from app/femr/data/models/MedicationMeasurementUnit.java rename to app/femr/data/models/mysql/MedicationMeasurementUnit.java index d578fbfe1..a3b131a95 100644 --- a/app/femr/data/models/MedicationMeasurementUnit.java +++ b/app/femr/data/models/mysql/MedicationMeasurementUnit.java @@ -16,7 +16,9 @@ along with fEMR. If not, see . If you have any questions, contact . */ -package femr.data.models; +package femr.data.models.mysql; + +import femr.data.models.core.IMedicationMeasurementUnit; import javax.persistence.Column; import javax.persistence.Entity; @@ -25,7 +27,7 @@ @Entity @Table(name = "medication_measurement_units") -public class MedicationMeasurementUnit implements IMedicationMeasurementUnit{ +public class MedicationMeasurementUnit implements IMedicationMeasurementUnit { @Id @Column(name = "id", unique = true, nullable = false) private int id; diff --git a/app/femr/data/models/mysql/MissionCity.java b/app/femr/data/models/mysql/MissionCity.java new file mode 100644 index 000000000..af1a5a6e5 --- /dev/null +++ b/app/femr/data/models/mysql/MissionCity.java @@ -0,0 +1,62 @@ +/* + fEMR - fast Electronic Medical Records + Copyright (C) 2014 Team fEMR + + fEMR is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + fEMR is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with fEMR. If not, see . If + you have any questions, contact . +*/ +package femr.data.models.mysql; + +import femr.data.models.core.IMissionCity; +import femr.data.models.core.IMissionCountry; + +import javax.persistence.*; + +@Entity +@Table(name = "mission_cities") +public class MissionCity implements IMissionCity { + @Id + @Column(name = "id", unique = true, nullable = false) + private int id; + @Column(name = "name", unique = true, nullable = false) + private String name; + @ManyToOne(fetch = FetchType.EAGER) + @JoinColumn(name = "mission_country_id", nullable = false) + private MissionCountry missionCountry; + + @Override + public int getId() { + return id; + } + + @Override + public String getName() { + return name; + } + + @Override + public void setName(String name) { + this.name = name; + } + + @Override + public IMissionCountry getMissionCountry() { + return missionCountry; + } + + @Override + public void setMissionCountry(IMissionCountry missionCountry) { + this.missionCountry = (MissionCountry) missionCountry; + } +} diff --git a/app/femr/data/models/mysql/MissionCountry.java b/app/femr/data/models/mysql/MissionCountry.java new file mode 100644 index 000000000..8c3e1083b --- /dev/null +++ b/app/femr/data/models/mysql/MissionCountry.java @@ -0,0 +1,51 @@ +/* + fEMR - fast Electronic Medical Records + Copyright (C) 2014 Team fEMR + + fEMR is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + fEMR is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with fEMR. If not, see . If + you have any questions, contact . +*/ +package femr.data.models.mysql; + +import femr.data.models.core.IMissionCountry; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.Table; + +@Entity +@Table(name = "mission_countries") +public class MissionCountry implements IMissionCountry { + @Id + @Column(name = "id", unique = true, nullable = false) + private int id; + @Column(name = "name", unique = true, nullable = false) + private String name; + + @Override + public int getId() { + return id; + } + + @Override + public String getName() { + return name; + } + + @Override + public void setName(String name) { + this.name = name; + } +} diff --git a/app/femr/data/models/mysql/MissionTeam.java b/app/femr/data/models/mysql/MissionTeam.java new file mode 100644 index 000000000..af09fdfc9 --- /dev/null +++ b/app/femr/data/models/mysql/MissionTeam.java @@ -0,0 +1,86 @@ +/* + fEMR - fast Electronic Medical Records + Copyright (C) 2014 Team fEMR + + fEMR is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + fEMR is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with fEMR. If not, see . If + you have any questions, contact . +*/ +package femr.data.models.mysql; + +import femr.data.models.core.IMissionTeam; + +import javax.persistence.*; +import java.util.List; + +@Entity +@Table(name = "mission_teams") +public class MissionTeam implements IMissionTeam { + @Id + @Column(name = "id", unique = true, nullable = false) + private int id; + @Column(name = "name", unique = true, nullable = false) + private String name; + @Column(name = "location", unique = true, nullable = false) + private String location; + @Column(name = "description", unique = true, nullable = false) + private String description; + @OneToMany(fetch = FetchType.LAZY, + mappedBy = "missionTeam") + private List missionTrips; + + @Override + public int getId() { + return id; + } + + @Override + public String getName() { + return name; + } + + @Override + public void setName(String name) { + this.name = name; + } + + @Override + public String getLocation() { + return location; + } + + @Override + public void setLocation(String location) { + this.location = location; + } + + @Override + public String getDescription() { + return description; + } + + @Override + public void setDescription(String description) { + this.description = description; + } + + @Override + public List getMissionTrips() { + return missionTrips; + } + + @Override + public void setMissionTrips(List missionTrips) { + this.missionTrips = missionTrips; + } +} diff --git a/app/femr/data/models/mysql/MissionTrip.java b/app/femr/data/models/mysql/MissionTrip.java new file mode 100644 index 000000000..ea025bab7 --- /dev/null +++ b/app/femr/data/models/mysql/MissionTrip.java @@ -0,0 +1,101 @@ +/* + fEMR - fast Electronic Medical Records + Copyright (C) 2014 Team fEMR + + fEMR is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + fEMR is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with fEMR. If not, see . If + you have any questions, contact . +*/ +package femr.data.models.mysql; + +import femr.data.models.core.IMissionCity; +import femr.data.models.core.IMissionTeam; +import femr.data.models.core.IMissionTrip; + +import javax.persistence.*; +import java.util.Date; + +@Entity +@Table(name = "mission_trips") +public class MissionTrip implements IMissionTrip { + @Id + @Column(name = "id", unique = true, nullable = false) + private int id; + @ManyToOne(fetch = FetchType.EAGER) + @JoinColumn(name = "mission_team_id") + private MissionTeam missionTeam; + @ManyToOne(fetch = FetchType.EAGER) + @JoinColumn(name = "mission_city_id") + private MissionCity missionCity; + @Column(name = "isCurrent", nullable = false) + private boolean isCurrent; + @Column(name = "start_date") + private Date startDate; + @Column(name = "end_date") + private Date endDate; + + @Override + public int getId() { + return id; + } + + @Override + public IMissionTeam getMissionTeam() { + return missionTeam; + } + + @Override + public void setMissionTeam(IMissionTeam missionTeam) { + this.missionTeam = (MissionTeam) missionTeam; + } + + @Override + public IMissionCity getMissionCity() { + return missionCity; + } + + @Override + public void setMissionCity(IMissionCity missionCity) { + this.missionCity = (MissionCity) missionCity; + } + + @Override + public boolean isCurrent() { + return isCurrent; + } + + @Override + public void setCurrent(boolean isCurrent) { + this.isCurrent = isCurrent; + } + + @Override + public Date getStartDate() { + return startDate; + } + + @Override + public void setStartDate(Date startDate) { + this.startDate = startDate; + } + + @Override + public Date getEndDate() { + return endDate; + } + + @Override + public void setEndDate(Date endDate) { + this.endDate = endDate; + } +} diff --git a/app/femr/data/models/Patient.java b/app/femr/data/models/mysql/Patient.java similarity index 96% rename from app/femr/data/models/Patient.java rename to app/femr/data/models/mysql/Patient.java index cced180c1..648506c6e 100644 --- a/app/femr/data/models/Patient.java +++ b/app/femr/data/models/mysql/Patient.java @@ -16,7 +16,10 @@ along with fEMR. If not, see . If you have any questions, contact . */ -package femr.data.models; +package femr.data.models.mysql; + +import femr.data.models.core.IPatient; +import femr.data.models.core.IPhoto; import javax.persistence.*; import java.util.Date; diff --git a/app/femr/data/models/PatientAgeClassification.java b/app/femr/data/models/mysql/PatientAgeClassification.java similarity index 95% rename from app/femr/data/models/PatientAgeClassification.java rename to app/femr/data/models/mysql/PatientAgeClassification.java index 301b42c8c..f0957a8b3 100644 --- a/app/femr/data/models/PatientAgeClassification.java +++ b/app/femr/data/models/mysql/PatientAgeClassification.java @@ -16,7 +16,9 @@ along with fEMR. If not, see . If you have any questions, contact . */ -package femr.data.models; +package femr.data.models.mysql; + +import femr.data.models.core.IPatientAgeClassification; import javax.persistence.*; diff --git a/app/femr/data/models/PatientEncounter.java b/app/femr/data/models/mysql/PatientEncounter.java similarity index 92% rename from app/femr/data/models/PatientEncounter.java rename to app/femr/data/models/mysql/PatientEncounter.java index 0c1a8e553..0b7b0fdee 100644 --- a/app/femr/data/models/PatientEncounter.java +++ b/app/femr/data/models/mysql/PatientEncounter.java @@ -16,8 +16,9 @@ along with fEMR. If not, see . If you have any questions, contact . */ -package femr.data.models; +package femr.data.models.mysql; +import femr.data.models.core.*; import org.joda.time.DateTime; import javax.persistence.*; import java.util.ArrayList; @@ -55,6 +56,9 @@ public class PatientEncounter implements IPatientEncounter { @ManyToOne(fetch = FetchType.EAGER) @JoinColumn(name = "patient_age_classification_id") private PatientAgeClassification patientAgeClassification; + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "mission_trip_id") + private MissionTrip missionTrip; @Override public int getId() { @@ -166,4 +170,14 @@ public IPatientAgeClassification getPatientAgeClassification() { public void setPatientAgeClassification(IPatientAgeClassification patientAgeClassification) { this.patientAgeClassification = (PatientAgeClassification) patientAgeClassification; } + + @Override + public IMissionTrip getMissionTrip() { + return missionTrip; + } + + @Override + public void setMissionTrip(IMissionTrip missionTrip) { + this.missionTrip = (MissionTrip) missionTrip; + } } diff --git a/app/femr/data/models/PatientEncounterPhoto.java b/app/femr/data/models/mysql/PatientEncounterPhoto.java similarity index 94% rename from app/femr/data/models/PatientEncounterPhoto.java rename to app/femr/data/models/mysql/PatientEncounterPhoto.java index f65e2d251..613f9cd49 100644 --- a/app/femr/data/models/PatientEncounterPhoto.java +++ b/app/femr/data/models/mysql/PatientEncounterPhoto.java @@ -16,7 +16,9 @@ along with fEMR. If not, see . If you have any questions, contact . */ -package femr.data.models; +package femr.data.models.mysql; + +import femr.data.models.core.IPatientEncounterPhoto; import javax.persistence.*; diff --git a/app/femr/data/models/PatientEncounterTabField.java b/app/femr/data/models/mysql/PatientEncounterTabField.java similarity index 94% rename from app/femr/data/models/PatientEncounterTabField.java rename to app/femr/data/models/mysql/PatientEncounterTabField.java index b374bc60c..7315cad0b 100644 --- a/app/femr/data/models/PatientEncounterTabField.java +++ b/app/femr/data/models/mysql/PatientEncounterTabField.java @@ -16,14 +16,17 @@ along with fEMR. If not, see . If you have any questions, contact . */ -package femr.data.models; +package femr.data.models.mysql; +import femr.data.models.core.IChiefComplaint; +import femr.data.models.core.IPatientEncounterTabField; +import femr.data.models.core.ITabField; import org.joda.time.DateTime; import javax.persistence.*; @Entity @Table(name="patient_encounter_tab_fields") -public class PatientEncounterTabField implements IPatientEncounterTabField{ +public class PatientEncounterTabField implements IPatientEncounterTabField { @Id @Column(name = "id", unique = true, nullable = false) private int id; diff --git a/app/femr/data/models/PatientEncounterVital.java b/app/femr/data/models/mysql/PatientEncounterVital.java similarity index 95% rename from app/femr/data/models/PatientEncounterVital.java rename to app/femr/data/models/mysql/PatientEncounterVital.java index 34f671bb4..1ebd383e2 100644 --- a/app/femr/data/models/PatientEncounterVital.java +++ b/app/femr/data/models/mysql/PatientEncounterVital.java @@ -16,7 +16,10 @@ along with fEMR. If not, see . If you have any questions, contact . */ -package femr.data.models; +package femr.data.models.mysql; + +import femr.data.models.core.IPatientEncounterVital; +import femr.data.models.core.IVital; import javax.persistence.*; diff --git a/app/femr/data/models/PatientPrescription.java b/app/femr/data/models/mysql/PatientPrescription.java similarity index 98% rename from app/femr/data/models/PatientPrescription.java rename to app/femr/data/models/mysql/PatientPrescription.java index 934f472aa..a30639f8c 100644 --- a/app/femr/data/models/PatientPrescription.java +++ b/app/femr/data/models/mysql/PatientPrescription.java @@ -16,8 +16,9 @@ along with fEMR. If not, see . If you have any questions, contact . */ -package femr.data.models; +package femr.data.models.mysql; +import femr.data.models.core.*; import org.joda.time.DateTime; import javax.persistence.*; diff --git a/app/femr/data/models/Photo.java b/app/femr/data/models/mysql/Photo.java similarity index 96% rename from app/femr/data/models/Photo.java rename to app/femr/data/models/mysql/Photo.java index 56b8c3827..c7998e21b 100644 --- a/app/femr/data/models/Photo.java +++ b/app/femr/data/models/mysql/Photo.java @@ -16,7 +16,9 @@ along with fEMR. If not, see . If you have any questions, contact . */ -package femr.data.models; +package femr.data.models.mysql; + +import femr.data.models.core.IPhoto; import javax.persistence.*; import java.util.Date; diff --git a/app/femr/data/models/Role.java b/app/femr/data/models/mysql/Role.java similarity index 95% rename from app/femr/data/models/Role.java rename to app/femr/data/models/mysql/Role.java index e16270602..aeb438854 100644 --- a/app/femr/data/models/Role.java +++ b/app/femr/data/models/mysql/Role.java @@ -16,7 +16,9 @@ along with fEMR. If not, see . If you have any questions, contact . */ -package femr.data.models; +package femr.data.models.mysql; + +import femr.data.models.core.IRole; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/app/femr/data/models/Roles.java b/app/femr/data/models/mysql/Roles.java similarity index 97% rename from app/femr/data/models/Roles.java rename to app/femr/data/models/mysql/Roles.java index 41bdfcb88..427a7a607 100644 --- a/app/femr/data/models/Roles.java +++ b/app/femr/data/models/mysql/Roles.java @@ -16,7 +16,7 @@ along with fEMR. If not, see . If you have any questions, contact . */ -package femr.data.models; +package femr.data.models.mysql; public class Roles { public static final int ADMINISTRATOR = 1; diff --git a/app/femr/data/models/SystemSetting.java b/app/femr/data/models/mysql/SystemSetting.java similarity index 95% rename from app/femr/data/models/SystemSetting.java rename to app/femr/data/models/mysql/SystemSetting.java index 99b13bffd..c362fc0e5 100644 --- a/app/femr/data/models/SystemSetting.java +++ b/app/femr/data/models/mysql/SystemSetting.java @@ -16,7 +16,9 @@ along with fEMR. If not, see . If you have any questions, contact . */ -package femr.data.models; +package femr.data.models.mysql; + +import femr.data.models.core.ISystemSetting; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/app/femr/data/models/Tab.java b/app/femr/data/models/mysql/Tab.java similarity index 97% rename from app/femr/data/models/Tab.java rename to app/femr/data/models/mysql/Tab.java index 93a71c6cf..882ba255e 100644 --- a/app/femr/data/models/Tab.java +++ b/app/femr/data/models/mysql/Tab.java @@ -16,8 +16,9 @@ along with fEMR. If not, see . If you have any questions, contact . */ -package femr.data.models; +package femr.data.models.mysql; +import femr.data.models.core.ITab; import org.joda.time.DateTime; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/app/femr/data/models/TabField.java b/app/femr/data/models/mysql/TabField.java similarity index 94% rename from app/femr/data/models/TabField.java rename to app/femr/data/models/mysql/TabField.java index 441625ebf..7b926ba22 100644 --- a/app/femr/data/models/TabField.java +++ b/app/femr/data/models/mysql/TabField.java @@ -16,7 +16,12 @@ along with fEMR. If not, see . If you have any questions, contact . */ -package femr.data.models; +package femr.data.models.mysql; + +import femr.data.models.core.ITab; +import femr.data.models.core.ITabField; +import femr.data.models.core.ITabFieldSize; +import femr.data.models.core.ITabFieldType; import javax.persistence.*; diff --git a/app/femr/data/models/TabFieldSize.java b/app/femr/data/models/mysql/TabFieldSize.java similarity index 95% rename from app/femr/data/models/TabFieldSize.java rename to app/femr/data/models/mysql/TabFieldSize.java index 90b426705..cebf83067 100644 --- a/app/femr/data/models/TabFieldSize.java +++ b/app/femr/data/models/mysql/TabFieldSize.java @@ -16,7 +16,9 @@ along with fEMR. If not, see . If you have any questions, contact . */ -package femr.data.models; +package femr.data.models.mysql; + +import femr.data.models.core.ITabFieldSize; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/app/femr/data/models/TabFieldType.java b/app/femr/data/models/mysql/TabFieldType.java similarity index 95% rename from app/femr/data/models/TabFieldType.java rename to app/femr/data/models/mysql/TabFieldType.java index 280ee6154..4beddd04c 100644 --- a/app/femr/data/models/TabFieldType.java +++ b/app/femr/data/models/mysql/TabFieldType.java @@ -16,7 +16,9 @@ along with fEMR. If not, see . If you have any questions, contact . */ -package femr.data.models; +package femr.data.models.mysql; + +import femr.data.models.core.ITabFieldType; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/app/femr/data/models/User.java b/app/femr/data/models/mysql/User.java similarity index 97% rename from app/femr/data/models/User.java rename to app/femr/data/models/mysql/User.java index 5b3c10123..ffb0b9d01 100644 --- a/app/femr/data/models/User.java +++ b/app/femr/data/models/mysql/User.java @@ -16,8 +16,10 @@ along with fEMR. If not, see . If you have any questions, contact . */ -package femr.data.models; +package femr.data.models.mysql; +import femr.data.models.core.IRole; +import femr.data.models.core.IUser; import org.joda.time.DateTime; import javax.persistence.*; diff --git a/app/femr/data/models/Vital.java b/app/femr/data/models/mysql/Vital.java similarity index 96% rename from app/femr/data/models/Vital.java rename to app/femr/data/models/mysql/Vital.java index 3499abd90..22956404f 100644 --- a/app/femr/data/models/Vital.java +++ b/app/femr/data/models/mysql/Vital.java @@ -16,7 +16,9 @@ along with fEMR. If not, see . If you have any questions, contact . */ -package femr.data.models; +package femr.data.models.mysql; + +import femr.data.models.core.IVital; import javax.persistence.*; diff --git a/app/femr/ui/controllers/HistoryController.java b/app/femr/ui/controllers/HistoryController.java index 9d12403fa..6c9e085fa 100644 --- a/app/femr/ui/controllers/HistoryController.java +++ b/app/femr/ui/controllers/HistoryController.java @@ -1,11 +1,14 @@ package femr.ui.controllers; import com.google.inject.Inject; -import femr.business.services.*; -import femr.common.dto.CurrentUser; -import femr.common.dto.ServiceResponse; +import femr.business.services.core.IEncounterService; +import femr.business.services.core.IPhotoService; +import femr.business.services.core.ISearchService; +import femr.business.services.core.ISessionService; +import femr.common.dtos.CurrentUser; +import femr.common.dtos.ServiceResponse; import femr.common.models.*; -import femr.data.models.*; +import femr.data.models.mysql.Roles; import femr.ui.helpers.security.AllowedRoles; import femr.ui.helpers.security.FEMRAuthenticated; import femr.ui.models.history.IndexEncounterMedicalViewModel; @@ -29,19 +32,21 @@ @Security.Authenticated(FEMRAuthenticated.class) @AllowedRoles({Roles.PHYSICIAN, Roles.PHARMACIST, Roles.NURSE}) public class HistoryController extends Controller { - private ISessionService sessionService; - private ISearchService searchService; - private IPharmacyService pharmacyService; - private IPhotoService photoService; + + private final IEncounterService encounterService; + private final ISessionService sessionService; + private final ISearchService searchService; + private final IPhotoService photoService; @Inject - public HistoryController(ISessionService sessionService, + public HistoryController(IEncounterService encounterService, + ISessionService sessionService, ISearchService searchService, - IPharmacyService pharmacyService, IPhotoService photoService) { + + this.encounterService = encounterService; this.sessionService = sessionService; this.searchService = searchService; - this.pharmacyService = pharmacyService; this.photoService = photoService; } @@ -166,7 +171,7 @@ public Result indexEncounterGet(int encounterId) { //get problems List problems = new ArrayList<>(); - ServiceResponse> problemItemServiceResponse = pharmacyService.findProblemItems(encounterId); + ServiceResponse> problemItemServiceResponse = encounterService.findProblemItems(encounterId); if (problemItemServiceResponse.hasErrors()){ throw new RuntimeException(); } diff --git a/app/femr/ui/controllers/HomeController.java b/app/femr/ui/controllers/HomeController.java index 3f3d99b4e..03af27c48 100644 --- a/app/femr/ui/controllers/HomeController.java +++ b/app/femr/ui/controllers/HomeController.java @@ -1,8 +1,8 @@ package femr.ui.controllers; import com.google.inject.Inject; -import femr.common.dto.CurrentUser; -import femr.business.services.ISessionService; +import femr.common.dtos.CurrentUser; +import femr.business.services.core.ISessionService; import femr.ui.views.html.home.index; import femr.ui.views.html.sessions.create; import play.mvc.Controller; @@ -26,4 +26,8 @@ public Result index() { return ok(create.render(null)); } + + + + } \ No newline at end of file diff --git a/app/femr/ui/controllers/MedicalController.java b/app/femr/ui/controllers/MedicalController.java index dd1351e75..19886d53b 100644 --- a/app/femr/ui/controllers/MedicalController.java +++ b/app/femr/ui/controllers/MedicalController.java @@ -3,11 +3,11 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.google.inject.Inject; -import femr.business.services.*; -import femr.common.dto.CurrentUser; -import femr.common.dto.ServiceResponse; +import femr.business.services.core.*; +import femr.common.dtos.CurrentUser; +import femr.common.dtos.ServiceResponse; import femr.common.models.*; -import femr.data.models.Roles; +import femr.data.models.mysql.Roles; import femr.ui.helpers.security.AllowedRoles; import femr.ui.helpers.security.FEMRAuthenticated; import femr.ui.models.medical.*; @@ -32,20 +32,29 @@ public class MedicalController extends Controller { private final Form createViewModelPostForm = Form.form(EditViewModelPost.class); private final Form updateVitalsModelForm = Form.form(UpdateVitalsModel.class); + private final ICustomTabService customTabService; + private final IEncounterService encounterService; + private final IMedicationService medicationService; + private final IPhotoService photoService; private final ISessionService sessionService; private final ISearchService searchService; - private final IMedicalService medicalService; - private final IPhotoService photoService; + private final IVitalService vitalService; @Inject - public MedicalController(ISessionService sessionService, + public MedicalController(ICustomTabService customTabService, + IEncounterService encounterService, + IMedicationService medicationService, + IPhotoService photoService, + ISessionService sessionService, ISearchService searchService, - IMedicalService medicalService, - IPhotoService photoService) { + IVitalService vitalService) { + this.customTabService = customTabService; + this.encounterService = encounterService; this.sessionService = sessionService; this.searchService = searchService; - this.medicalService = medicalService; + this.medicationService = medicationService; this.photoService = photoService; + this.vitalService = vitalService; } public Result indexGet() { @@ -77,7 +86,7 @@ public Result indexPost() { } //check if the doc has already seen the patient today - ServiceResponse userItemServiceResponse = medicalService.getPhysicianThatCheckedInPatient(patientEncounterItem.getId()); + ServiceResponse userItemServiceResponse = encounterService.getPhysicianThatCheckedInPatientToMedical(patientEncounterItem.getId()); if (userItemServiceResponse.hasErrors()) { throw new RuntimeException(); } else { @@ -133,7 +142,7 @@ public Result editGet(int patientId) { //Map // String = tab field name // TabFieldItem contains value - ServiceResponse> patientEncounterTabFieldResponse = medicalService.findCurrentTabFieldsByEncounterId(patientEncounter.getId()); + ServiceResponse> patientEncounterTabFieldResponse = encounterService.findCurrentTabFieldsByEncounterId(patientEncounter.getId()); Map tabFieldItemMap; if (patientEncounterTabFieldResponse.hasErrors()) { throw new RuntimeException(); @@ -143,13 +152,13 @@ public Result editGet(int patientId) { } //get custom tabs/fields - ServiceResponse> tabItemResponse = medicalService.getCustomTabs(); + ServiceResponse> tabItemResponse = customTabService.getCustomTabs(false); if (tabItemResponse.hasErrors()) { throw new RuntimeException(); } else { viewModelGet.setCustomTabs(tabItemResponse.getResponseObject()); } - ServiceResponse>> tabFieldResponse = medicalService.getCustomFields(patientEncounter.getId()); + ServiceResponse>> tabFieldResponse = customTabService.getTabFields(patientEncounter.getId()); if (tabFieldResponse.hasErrors()) { throw new RuntimeException(); } else { @@ -180,7 +189,7 @@ public Result editPost(int patientId) { throw new RuntimeException(); } PatientEncounterItem patientEncounterItem = patientEncounterServiceResponse.getResponseObject(); - patientEncounterItem = medicalService.checkPatientIn(patientEncounterItem.getId(), currentUserSession.getId()).getResponseObject(); + patientEncounterItem = encounterService.checkPatientInToMedical(patientEncounterItem.getId(), currentUserSession.getId()).getResponseObject(); //update patient encounter //Maps the dynamic tab name to the field list @@ -203,7 +212,7 @@ public Result editPost(int patientId) { //save the custom fields, if any if (customFieldItems.size() > 0) { ServiceResponse> customFieldItemResponse = - medicalService.createPatientEncounterTabFields(customFieldItems, patientEncounterItem.getId(), currentUserSession.getId()); + encounterService.createPatientEncounterTabFields(customFieldItems, patientEncounterItem.getId(), currentUserSession.getId()); if (customFieldItemResponse.hasErrors()) { throw new RuntimeException(); } @@ -225,7 +234,7 @@ public Result editPost(int patientId) { if (nonCustomFieldItems.size() > 0) { ServiceResponse> nonCustomFieldItemResponse = - medicalService.createPatientEncounterTabFields(nonCustomFieldItems, patientEncounterItem.getId(), currentUserSession.getId()); + encounterService.createPatientEncounterTabFields(nonCustomFieldItems, patientEncounterItem.getId(), currentUserSession.getId()); if (nonCustomFieldItemResponse.hasErrors()) { throw new RuntimeException(); } @@ -258,12 +267,9 @@ public Result editPost(int patientId) { if (viewModelPost.getPrescription5() != null && StringUtils.isNotNullOrWhiteSpace(viewModelPost.getPrescription5())) prescriptionItems.add(new PrescriptionItem(viewModelPost.getPrescription5())); if (prescriptionItems.size() > 0) { - ServiceResponse> prescriptionResponse = medicalService.createPatientPrescriptions( - prescriptionItems, - currentUserSession.getId(), - patientEncounterItem.getId(), - false - ); + + ServiceResponse> prescriptionResponse = + medicationService.createPatientPrescriptions(prescriptionItems, currentUserSession.getId(), patientEncounterItem.getId(), false, false); if (prescriptionResponse.hasErrors()) { throw new RuntimeException(); } @@ -282,7 +288,7 @@ public Result updateVitalsPost(int id) { throw new RuntimeException(); } //update date_of_medical_visit when a vital is updated - medicalService.checkPatientIn(currentEncounterByPatientId.getResponseObject().getId(), currentUser.getId()); + encounterService.checkPatientInToMedical(currentEncounterByPatientId.getResponseObject().getId(), currentUser.getId()); PatientEncounterItem patientEncounter = currentEncounterByPatientId.getResponseObject(); @@ -290,7 +296,7 @@ public Result updateVitalsPost(int id) { Map patientEncounterVitals = getPatientEncounterVitals(updateVitalsModel); ServiceResponse> patientEncounterVitalsServiceResponse = - medicalService.createPatientEncounterVitals(patientEncounterVitals, currentUser.getId(), patientEncounter.getId()); + vitalService.createPatientEncounterVitals(patientEncounterVitals, currentUser.getId(), patientEncounter.getId()); if (patientEncounterVitalsServiceResponse.hasErrors()) { throw new RuntimeException(); } diff --git a/app/femr/ui/controllers/PharmaciesController.java b/app/femr/ui/controllers/PharmaciesController.java index 44720e040..7313bfe40 100644 --- a/app/femr/ui/controllers/PharmaciesController.java +++ b/app/femr/ui/controllers/PharmaciesController.java @@ -1,12 +1,14 @@ package femr.ui.controllers; -import com.google.gson.JsonObject; import com.google.inject.Inject; -import femr.business.services.*; -import femr.common.dto.CurrentUser; -import femr.common.dto.ServiceResponse; +import femr.business.services.core.IEncounterService; +import femr.business.services.core.IMedicationService; +import femr.business.services.core.ISearchService; +import femr.business.services.core.ISessionService; +import femr.common.dtos.CurrentUser; +import femr.common.dtos.ServiceResponse; import femr.common.models.*; -import femr.data.models.Roles; +import femr.data.models.mysql.Roles; import femr.ui.helpers.security.AllowedRoles; import femr.ui.helpers.security.FEMRAuthenticated; import femr.ui.models.pharmacy.*; @@ -24,16 +26,20 @@ @Security.Authenticated(FEMRAuthenticated.class) @AllowedRoles({Roles.PHYSICIAN, Roles.PHARMACIST, Roles.NURSE}) public class PharmaciesController extends Controller { + private final Form populatedViewModelPostForm = Form.form(EditViewModelPost.class); - private ISessionService sessionService; - private ISearchService searchService; - private IPharmacyService pharmacyService; + private final IEncounterService encounterService; + private final IMedicationService medicationService; + private final ISessionService sessionService; + private final ISearchService searchService; @Inject - public PharmaciesController(IPharmacyService pharmacyService, + public PharmaciesController(IEncounterService encounterService, + IMedicationService medicationService, ISessionService sessionService, ISearchService searchService) { - this.pharmacyService = pharmacyService; + this.encounterService = encounterService; + this.medicationService = medicationService; this.sessionService = sessionService; this.searchService = searchService; } @@ -121,7 +127,7 @@ public Result editGet(int patientId) { viewModelGet.setMedications(prescriptionItemServiceResponse.getResponseObject()); //find patient problems, they do not have to exist. - ServiceResponse> problemItemServiceResponse = pharmacyService.findProblemItems(patientEncounterItem.getId()); + ServiceResponse> problemItemServiceResponse = encounterService.findProblemItems(patientEncounterItem.getId()); if (problemItemServiceResponse.hasErrors()) { throw new RuntimeException(); } else { @@ -160,7 +166,7 @@ public Result editPost(int id) { PrescriptionItem prescriptionItem = new PrescriptionItem(); if (StringUtils.isNotNullOrWhiteSpace(createViewModelPost.getReplacementMedication1())) { prescriptionItem.setName(createViewModelPost.getReplacementMedication1()); - ServiceResponse response = pharmacyService.createAndReplacePrescription( + ServiceResponse response = medicationService.createAndReplacePrescription( prescriptionItem, createViewModelPost.getId_prescription1(), currentUserSession.getId(), @@ -175,7 +181,7 @@ public Result editPost(int id) { //replace prescription 2 if (StringUtils.isNotNullOrWhiteSpace(createViewModelPost.getReplacementMedication2())) { prescriptionItem.setName(createViewModelPost.getReplacementMedication2()); - ServiceResponse response = pharmacyService.createAndReplacePrescription( + ServiceResponse response = medicationService.createAndReplacePrescription( prescriptionItem, createViewModelPost.getId_prescription2(), currentUserSession.getId(), @@ -190,7 +196,7 @@ public Result editPost(int id) { //replace prescription 3 if (StringUtils.isNotNullOrWhiteSpace(createViewModelPost.getReplacementMedication3())) { prescriptionItem.setName(createViewModelPost.getReplacementMedication3()); - ServiceResponse response = pharmacyService.createAndReplacePrescription( + ServiceResponse response = medicationService.createAndReplacePrescription( prescriptionItem, createViewModelPost.getId_prescription3(), currentUserSession.getId(), @@ -205,7 +211,7 @@ public Result editPost(int id) { //replace prescription 4 if (StringUtils.isNotNullOrWhiteSpace(createViewModelPost.getReplacementMedication4())) { prescriptionItem.setName(createViewModelPost.getReplacementMedication4()); - ServiceResponse response = pharmacyService.createAndReplacePrescription( + ServiceResponse response = medicationService.createAndReplacePrescription( prescriptionItem, createViewModelPost.getId_prescription4(), currentUserSession.getId(), @@ -220,7 +226,7 @@ public Result editPost(int id) { //replace prescription 5 if (StringUtils.isNotNullOrWhiteSpace(createViewModelPost.getReplacementMedication5())) { prescriptionItem.setName(createViewModelPost.getReplacementMedication5()); - ServiceResponse response = pharmacyService.createAndReplacePrescription( + ServiceResponse response = medicationService.createAndReplacePrescription( prescriptionItem, createViewModelPost.getId_prescription5(), currentUserSession.getId(), @@ -234,20 +240,20 @@ public Result editPost(int id) { } //update non-replaced prescriptions to dispensed - ServiceResponse> prescriptionDispensedResponse = pharmacyService.markPrescriptionsAsFilled(prescriptionToMarkAsDispensedOrCounseled); + ServiceResponse> prescriptionDispensedResponse = medicationService.markPrescriptionsAsFilled(prescriptionToMarkAsDispensedOrCounseled); if (prescriptionDispensedResponse.hasErrors()) { throw new RuntimeException(); } //update non-replaced prescriptions that the patient was counseled on if (isCounseled){ - ServiceResponse> prescriptionCounseledResponse = pharmacyService.markPrescriptionsAsCounseled(prescriptionToMarkAsDispensedOrCounseled); + ServiceResponse> prescriptionCounseledResponse = medicationService.markPrescriptionsAsCounseled(prescriptionToMarkAsDispensedOrCounseled); if (prescriptionCounseledResponse.hasErrors()){ throw new RuntimeException(); } } //check the patient in! - pharmacyService.checkPatientIn(patientEncounterItem.getId(), currentUserSession.getId()); + encounterService.checkPatientInToPharmacy(patientEncounterItem.getId(), currentUserSession.getId()); String message = "Patient information for " + patientItem.getFirstName() + " " + @@ -266,21 +272,12 @@ public Result editPost(int id) { * @return JSON object of medications that exist in the medications table */ public Result typeaheadJSONGet() { - JsonObject jsonObject = new JsonObject(); - //get a list of medications in the medication table - //these medications are added by an administrator in the admin section - ServiceResponse> medicationServiceResponse = pharmacyService.findAllMedications(); + ServiceResponse medicationServiceResponse = medicationService.getMedicationNames(); if (medicationServiceResponse.hasErrors()) { - return ok(jsonObject.toString()); + return ok(""); } - List medications = medicationServiceResponse.getResponseObject(); - - //create a JsonObject to send back via AJAX - for (int medication = 0; medication < medications.size(); medication++) { - jsonObject.addProperty("medicine" + medication, medications.get(medication)); - } - return ok(jsonObject.toString()); + return ok(medicationServiceResponse.getResponseObject()); } } diff --git a/app/femr/ui/controllers/PhotoController.java b/app/femr/ui/controllers/PhotoController.java index b4c117209..fd05331ca 100644 --- a/app/femr/ui/controllers/PhotoController.java +++ b/app/femr/ui/controllers/PhotoController.java @@ -2,9 +2,9 @@ import com.google.inject.Inject; import com.typesafe.config.ConfigFactory; -import femr.common.dto.ServiceResponse; -import femr.business.services.IPhotoService; -import femr.data.models.Roles; +import femr.common.dtos.ServiceResponse; +import femr.business.services.core.IPhotoService; +import femr.data.models.mysql.Roles; import femr.ui.helpers.security.AllowedRoles; import femr.ui.helpers.security.FEMRAuthenticated; import femr.util.stringhelpers.StringUtils; diff --git a/app/femr/ui/controllers/ResearchController.java b/app/femr/ui/controllers/ResearchController.java index 2296d7a8d..5312f1f4c 100644 --- a/app/femr/ui/controllers/ResearchController.java +++ b/app/femr/ui/controllers/ResearchController.java @@ -1,20 +1,30 @@ package femr.ui.controllers; - +import com.google.gson.Gson; import com.google.inject.Inject; -import femr.common.dto.CurrentUser; -import femr.business.services.IResearchService; -import femr.business.services.ISessionService; - -import femr.data.models.Roles; +import femr.business.helpers.DomainMapper; +import femr.common.dtos.ServiceResponse; +import femr.common.models.ResearchFilterItem; +import femr.ui.models.research.json.ResearchGraphDataItem; +import femr.common.dtos.CurrentUser; +import femr.business.services.core.IResearchService; +import femr.business.services.core.ISessionService; +import femr.data.models.mysql.Roles; import femr.ui.helpers.security.AllowedRoles; import femr.ui.helpers.security.FEMRAuthenticated; import femr.ui.views.html.research.index; +import femr.ui.views.html.research.generatedata; +import femr.ui.models.research.FilterViewModel; +import play.data.Form; import play.mvc.Controller; import play.mvc.Result; import play.mvc.Security; +import java.text.SimpleDateFormat; +import java.util.*; + + /** * This is the controller for the research page, it is currently not supported. * Research was designed before combining of some tables in the database @@ -22,6 +32,9 @@ @Security.Authenticated(FEMRAuthenticated.class) @AllowedRoles({Roles.RESEARCHER}) public class ResearchController extends Controller { + + private final Form FilterViewModelForm = Form.form(FilterViewModel.class); + private IResearchService researchService; private ISessionService sessionService; @@ -38,9 +51,49 @@ public ResearchController(ISessionService sessionService, IResearchService resea } public Result indexGet() { + + // There isn't really a request here, should this be different? + //TODO: nothing to bind here + FilterViewModel filterViewModel = FilterViewModelForm.bindFromRequest().get(); + + // Set Default Start (30 Days Ago) and End Date (Today) + Calendar today = Calendar.getInstance(); + SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); + filterViewModel.setEndDate(dateFormat.format(today.getTime())); + today.add(Calendar.DAY_OF_MONTH, -30); + filterViewModel.setStartDate(dateFormat.format(today.getTime())); + + ServiceResponse> medResponse = researchService.getAllMedications(); + if( !medResponse.hasErrors() ) { + filterViewModel.setMedicationsList(medResponse.getResponseObject()); + } + CurrentUser currentUserSession = sessionService.getCurrentUserSession(); + return ok(index.render(currentUserSession, filterViewModel)); + } + + public Result generateData() { + FilterViewModel viewModel = FilterViewModelForm.bindFromRequest().get(); + CurrentUser currentUserSession = sessionService.getCurrentUserSession(); + return ok(generatedata.render(currentUserSession, viewModel)); + } + public Result getGraphPost(){ - return ok(index.render(currentUserSession)); + FilterViewModel filterViewModel = FilterViewModelForm.bindFromRequest().get(); + //TODO: domain mapper out of scope + ResearchFilterItem researchFilterItem = DomainMapper.createResearchFilterItem(filterViewModel); + + ServiceResponse response = researchService.getGraphData(researchFilterItem); + ResearchGraphDataItem graphModel = new ResearchGraphDataItem(); + if( !response.hasErrors() ) { + + graphModel = response.getResponseObject(); + } + + Gson gson = new Gson(); + String jsonString = gson.toJson(graphModel); + return ok(jsonString); } + } diff --git a/app/femr/ui/controllers/SearchController.java b/app/femr/ui/controllers/SearchController.java index 723e6bd0e..d8d093f3d 100644 --- a/app/femr/ui/controllers/SearchController.java +++ b/app/femr/ui/controllers/SearchController.java @@ -1,18 +1,22 @@ package femr.ui.controllers; +import com.google.gson.Gson; import com.google.inject.Inject; -import femr.business.services.ISearchService; -import femr.business.services.ISessionService; -import femr.common.dto.ServiceResponse; +import femr.business.services.core.ISearchService; +import femr.business.services.core.ISessionService; +import femr.common.dtos.ServiceResponse; import femr.common.models.PatientItem; -import femr.data.models.Roles; +import femr.data.models.mysql.Roles; import femr.ui.helpers.security.AllowedRoles; import femr.ui.helpers.security.FEMRAuthenticated; +import femr.ui.models.search.json.PatientSearch; +import femr.util.calculations.dateUtils; import org.h2.util.StringUtils; import play.mvc.Controller; import play.mvc.Result; import play.mvc.Security; +import java.util.ArrayList; import java.util.List; //The purpose of this controller is to provide a universal @@ -85,5 +89,37 @@ public Result doesPatientExist(String query){ return ok("true"); } + public Result typeaheadPatientsJSONGet(){ + ServiceResponse> patientItemsServiceResponse = searchService.findPatientsForSearch(); + if (patientItemsServiceResponse.hasErrors()){ + return ok(""); + } + List patientItems = patientItemsServiceResponse.getResponseObject(); + List patientSearches = new ArrayList<>(); + PatientSearch patientSearch; + + for (PatientItem patientItem : patientItems) { + patientSearch = new PatientSearch(); + patientSearch.setId(Integer.toString(patientItem.getId())); + patientSearch.setFirstName(patientItem.getFirstName()); + patientSearch.setLastName(patientItem.getLastName()); + if (patientItem.getAge() != null) + patientSearch.setAge(patientItem.getAge()); + if (patientItem.getPathToPhoto() != null) + patientSearch.setPhoto(patientItem.getPathToPhoto()); + patientSearches.add(patientSearch); + } + + return ok(new Gson().toJson(patientSearches)); + } + + public Result typeaheadDiagnosisJSONGet(){ + + ServiceResponse> allDiagnosesServiceResponse = searchService.findDiagnosisForSearch(); + if (allDiagnosesServiceResponse.hasErrors()) + return ok(""); + + return ok(new Gson().toJson(allDiagnosesServiceResponse.getResponseObject())); + } } diff --git a/app/femr/ui/controllers/SessionsController.java b/app/femr/ui/controllers/SessionsController.java index 488b89113..d8f5aab5e 100644 --- a/app/femr/ui/controllers/SessionsController.java +++ b/app/femr/ui/controllers/SessionsController.java @@ -1,11 +1,11 @@ package femr.ui.controllers; import com.google.inject.Inject; -import femr.common.dto.CurrentUser; -import femr.common.dto.ServiceResponse; -import femr.business.services.ISessionService; -import femr.business.services.IUserService; -import femr.data.models.IUser; +import femr.common.dtos.CurrentUser; +import femr.common.dtos.ServiceResponse; +import femr.business.services.core.ISessionService; +import femr.business.services.core.IUserService; +import femr.data.models.core.IUser; import femr.ui.models.sessions.CreateViewModel; import femr.ui.views.html.sessions.create; import femr.ui.views.html.sessions.editPassword; diff --git a/app/femr/ui/controllers/SuperuserController.java b/app/femr/ui/controllers/SuperuserController.java index 0d9ddcb63..4a94cb75f 100644 --- a/app/femr/ui/controllers/SuperuserController.java +++ b/app/femr/ui/controllers/SuperuserController.java @@ -1,13 +1,31 @@ +/* + fEMR - fast Electronic Medical Records + Copyright (C) 2014 Team fEMR + + fEMR is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + fEMR is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with fEMR. If not, see . If + you have any questions, contact . +*/ package femr.ui.controllers; import com.google.inject.Inject; -import femr.common.dto.CurrentUser; -import femr.common.dto.ServiceResponse; -import femr.common.models.TabFieldItem; -import femr.common.models.TabItem; -import femr.business.services.ISessionService; -import femr.business.services.ISuperuserService; -import femr.data.models.Roles; +import femr.business.services.core.IMissionTripService; +import femr.common.dtos.CurrentUser; +import femr.common.dtos.ServiceResponse; +import femr.common.models.*; +import femr.business.services.core.ISessionService; +import femr.business.services.core.ICustomTabService; +import femr.data.models.mysql.Roles; import femr.ui.helpers.security.AllowedRoles; import femr.ui.helpers.security.FEMRAuthenticated; import femr.ui.models.superuser.*; @@ -19,6 +37,7 @@ import femr.ui.views.html.superuser.index; import femr.ui.views.html.superuser.tabs; import femr.ui.views.html.superuser.fields; +import femr.ui.views.html.superuser.trips; import java.util.List; @@ -27,14 +46,19 @@ public class SuperuserController extends Controller { private final Form TabsViewModelForm = Form.form(TabsViewModelPost.class); private final Form ContentViewModelForm = Form.form(ContentViewModelPost.class); - private ISessionService sessionService; - private ISuperuserService superuserService; + private Form tripViewModelPostForm = Form.form(TripViewModelPost.class); + private final ICustomTabService customTabService; + private final IMissionTripService missionTripService; + private final ISessionService sessionService; @Inject - public SuperuserController(ISessionService sessionService, - ISuperuserService superuserService) { + public SuperuserController(ICustomTabService customTabService, + IMissionTripService missionTripService, + ISessionService sessionService) { + + this.customTabService = customTabService; + this.missionTripService = missionTripService; this.sessionService = sessionService; - this.superuserService = superuserService; } public Result indexGet() { @@ -42,11 +66,102 @@ public Result indexGet() { return ok(index.render(currentUser)); } + public Result tripsGet() { + CurrentUser currentUser = sessionService.getCurrentUserSession(); + + ServiceResponse> missionItemServiceResponse = missionTripService.findAllTripInformation(); + if (missionItemServiceResponse.hasErrors()) + throw new RuntimeException(); + + ServiceResponse> availableTeamsServiceResponse = missionTripService.findAvailableTeams(); + if (availableTeamsServiceResponse.hasErrors()) + throw new RuntimeException(); + + ServiceResponse> availableCitiesServiceResponse = missionTripService.findAvailableCities(); + if (availableCitiesServiceResponse.hasErrors()) + throw new RuntimeException(); + + ServiceResponse> availableCountriesServiceResponse = missionTripService.findAvailableCountries(); + if (availableCountriesServiceResponse.hasErrors()) + throw new RuntimeException(); + + TripViewModelGet tripViewModel = new TripViewModelGet(); + tripViewModel.setMissionItems(missionItemServiceResponse.getResponseObject()); + tripViewModel.setAvailableTeams(availableTeamsServiceResponse.getResponseObject()); + tripViewModel.setAvailableCities(availableCitiesServiceResponse.getResponseObject()); + tripViewModel.setAvailableCountries(availableCountriesServiceResponse.getResponseObject()); + + + return ok(trips.render(currentUser, tripViewModel)); + } + + public Result toggleCurrentTripPost(int tripId) { + + CurrentUser currentUser = sessionService.getCurrentUserSession(); + + ServiceResponse tripItemUpdateServiceResponse = missionTripService.updateCurrentTrip(tripId); + if (tripItemUpdateServiceResponse.hasErrors()) { + throw new RuntimeException(); + } + + return ok(index.render(currentUser)); + } + + public Result tripsPost() { + + CurrentUser currentUser = sessionService.getCurrentUserSession(); + TripViewModelPost tripViewModelPost = tripViewModelPostForm.bindFromRequest().get(); + + //creating a new team or trip or city- + + //Create a new city if the user has entered the city and country + if (StringUtils.isNotNullOrWhiteSpace(tripViewModelPost.getNewCity()) && + StringUtils.isNotNullOrWhiteSpace(tripViewModelPost.getNewCityCountry())) { + + ServiceResponse newCityServiceResponse = missionTripService.createNewCity(tripViewModelPost.getNewCity(), tripViewModelPost.getNewCityCountry()); + if (newCityServiceResponse.hasErrors()) + throw new RuntimeException(); + } + + //Create a new team if the user has entered a team name + if (StringUtils.isNotNullOrWhiteSpace(tripViewModelPost.getNewTeamName())) { + + TeamItem teamItem = new TeamItem(); + teamItem.setName(tripViewModelPost.getNewTeamName()); + teamItem.setLocation(tripViewModelPost.getNewTeamLocation()); + teamItem.setDescription(tripViewModelPost.getNewTeamDescription()); + ServiceResponse newTeamItemServiceResponse = missionTripService.createNewTeam(teamItem); + if (newTeamItemServiceResponse.hasErrors()) + throw new RuntimeException(); + + } + + //create a new trip if the user has entered the information + if (StringUtils.isNotNullOrWhiteSpace(tripViewModelPost.getNewTripTeamName()) && + StringUtils.isNotNullOrWhiteSpace(tripViewModelPost.getNewTripCountry()) && + StringUtils.isNotNullOrWhiteSpace(tripViewModelPost.getNewTripCity()) && + tripViewModelPost.getNewTripStartDate() != null && + tripViewModelPost.getNewTripEndDate() != null) { + + TripItem tripItem = new TripItem(); + tripItem.setTeamName(tripViewModelPost.getNewTripTeamName()); + tripItem.setTripCity(tripViewModelPost.getNewTripCity()); + tripItem.setTripCountry(tripViewModelPost.getNewTripCountry()); + tripItem.setTripStartDate(tripViewModelPost.getNewTripStartDate()); + tripItem.setTripEndDate(tripViewModelPost.getNewTripEndDate()); + ServiceResponse newTripItemServiceResponse = missionTripService.createNewTrip(tripItem); + if (newTripItemServiceResponse.hasErrors()) + throw new RuntimeException(); + } + + return ok(index.render(currentUser)); + } + public Result tabsGet() { CurrentUser currentUser = sessionService.getCurrentUserSession(); ServiceResponse> response; - response = superuserService.getCustomTabs(false); + response = customTabService.getCustomTabs(false); if (response.hasErrors()) { throw new RuntimeException(); } @@ -55,7 +170,7 @@ public Result tabsGet() { viewModelGet.setCurrentTabs(response.getResponseObject()); //get deleted tabs - response = superuserService.getCustomTabs(true); + response = customTabService.getCustomTabs(true); if (response.hasErrors()) { throw new RuntimeException(); } @@ -72,11 +187,11 @@ public Result tabsPost() { if (StringUtils.isNotNullOrWhiteSpace(viewModelPost.getAddTabName())) { TabItem tabItem = new TabItem(); //new - if (!superuserService.doesTabExist(viewModelPost.getAddTabName()).getResponseObject()) { + if (!customTabService.doesTabExist(viewModelPost.getAddTabName()).getResponseObject()) { tabItem.setName(viewModelPost.getAddTabName()); if (viewModelPost.getAddTabLeft() != null) tabItem.setLeftColumnSize(viewModelPost.getAddTabLeft()); if (viewModelPost.getAddTabRight() != null) tabItem.setRightColumnSize(viewModelPost.getAddTabRight()); - ServiceResponse response = superuserService.createTab(tabItem, currentUser.getId()); + ServiceResponse response = customTabService.createTab(tabItem, currentUser.getId()); if (response.hasErrors()) { throw new RuntimeException(); } @@ -88,7 +203,7 @@ public Result tabsPost() { else tabItem.setRightColumnSize(viewModelPost.getAddTabRight()); tabItem.setName(viewModelPost.getAddTabName()); - ServiceResponse response = superuserService.editTab(tabItem, currentUser.getId()); + ServiceResponse response = customTabService.editTab(tabItem, currentUser.getId()); if (response.hasErrors()) { throw new RuntimeException(); } @@ -96,7 +211,7 @@ public Result tabsPost() { } //becomes toggle if (StringUtils.isNotNullOrWhiteSpace(viewModelPost.getDeleteTab())) { - ServiceResponse response = superuserService.toggleTab(viewModelPost.getDeleteTab()); + ServiceResponse response = customTabService.toggleTab(viewModelPost.getDeleteTab()); if (response.hasErrors()) { throw new RuntimeException(); } @@ -113,28 +228,28 @@ public Result contentGet(String name) { viewModelGet.setName(name); //get current custom fields - ServiceResponse> currentFieldItemsResponse = superuserService.getTabFields(name, false); + ServiceResponse> currentFieldItemsResponse = customTabService.getTabFieldsByTabName(name, false); if (currentFieldItemsResponse.hasErrors()) { throw new RuntimeException(); } viewModelGet.setCurrentCustomFieldItemList(currentFieldItemsResponse.getResponseObject()); //get removed custom fields - ServiceResponse> removedFieldItemsResponse = superuserService.getTabFields(name, true); + ServiceResponse> removedFieldItemsResponse = customTabService.getTabFieldsByTabName(name, true); if (currentFieldItemsResponse.hasErrors()) { throw new RuntimeException(); } viewModelGet.setRemovedCustomFieldItemList(removedFieldItemsResponse.getResponseObject()); //get available field types - ServiceResponse> fieldTypesResponse = superuserService.getTypes(); + ServiceResponse> fieldTypesResponse = customTabService.getTypes(); if (fieldTypesResponse.hasErrors()) { throw new RuntimeException(); } viewModelGet.setCustomFieldTypes(fieldTypesResponse.getResponseObject()); //get available fields sizes - ServiceResponse> fieldSizesResponse = superuserService.getSizes(); + ServiceResponse> fieldSizesResponse = customTabService.getSizes(); if (fieldSizesResponse.hasErrors()) { throw new RuntimeException(); } @@ -157,11 +272,11 @@ public Result contentPost(String name) { tabFieldItem.setOrder(viewModelPost.getAddOrder()); tabFieldItem.setPlaceholder(viewModelPost.getAddPlaceholder()); //edit - if (superuserService.doesTabFieldExist(viewModelPost.getAddName()).getResponseObject()) { - superuserService.editTabField(tabFieldItem); + if (customTabService.doesTabFieldExist(viewModelPost.getAddName()).getResponseObject()) { + customTabService.editTabField(tabFieldItem); } else { - ServiceResponse response = superuserService.createTabField(tabFieldItem, currentUser.getId(), name); + ServiceResponse response = customTabService.createTabField(tabFieldItem, currentUser.getId(), name); if (response.hasErrors()) { throw new RuntimeException(); } @@ -169,7 +284,7 @@ public Result contentPost(String name) { } //deactivating a field if (StringUtils.isNotNullOrWhiteSpace(viewModelPost.getToggleName())) { - ServiceResponse response = superuserService.toggleTabField(viewModelPost.getToggleName(), name); + ServiceResponse response = customTabService.toggleTabField(viewModelPost.getToggleName(), name); if (response.hasErrors()) { throw new RuntimeException(); } diff --git a/app/femr/ui/controllers/TriageController.java b/app/femr/ui/controllers/TriageController.java index 1d6bd513a..f0665c7e0 100644 --- a/app/femr/ui/controllers/TriageController.java +++ b/app/femr/ui/controllers/TriageController.java @@ -3,14 +3,11 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.google.inject.Inject; -import femr.common.dto.CurrentUser; -import femr.common.dto.ServiceResponse; -import femr.business.services.IPhotoService; -import femr.business.services.ISearchService; -import femr.business.services.ISessionService; -import femr.business.services.ITriageService; +import femr.business.services.core.*; +import femr.common.dtos.CurrentUser; +import femr.common.dtos.ServiceResponse; import femr.common.models.SettingItem; -import femr.data.models.Roles; +import femr.data.models.mysql.Roles; import femr.ui.helpers.security.AllowedRoles; import femr.ui.helpers.security.FEMRAuthenticated; import femr.common.models.PatientEncounterItem; @@ -21,7 +18,6 @@ import femr.util.stringhelpers.StringUtils; import play.data.Form; import play.mvc.*; - import java.util.HashMap; import java.util.List; import java.util.Map; @@ -31,20 +27,27 @@ public class TriageController extends Controller { private final Form IndexViewModelForm = Form.form(IndexViewModelPost.class); - private ITriageService triageService; - private ISessionService sessionService; - private ISearchService searchService; - private IPhotoService photoService; + private final IEncounterService encounterService; + private final IPatientService patientService; + private final ISessionService sessionService; + private final ISearchService searchService; + private final IPhotoService photoService; + private final IVitalService vitalService; @Inject - public TriageController(ITriageService triageService, + public TriageController(IEncounterService encounterService, ISessionService sessionService, ISearchService searchService, - IPhotoService photoService) { - this.triageService = triageService; + IPatientService patientService, + IPhotoService photoService, + IVitalService vitalService) { + + this.encounterService = encounterService; this.sessionService = sessionService; this.searchService = searchService; + this.patientService = patientService; this.photoService = photoService; + this.vitalService = vitalService; } public Result indexGet() { @@ -52,7 +55,7 @@ public Result indexGet() { //retrieve all the vitals in the database so we can dynamically name //the vitals in the view - ServiceResponse> vitalServiceResponse = triageService.findAllVitalItems(); + ServiceResponse> vitalServiceResponse = vitalService.findAllVitalItems(); if (vitalServiceResponse.hasErrors()) { throw new RuntimeException(); } @@ -67,7 +70,7 @@ public Result indexGet() { } //get age classifications - ServiceResponse> patientAgeClassificationsResponse = triageService.findPossibleAgeClassifications(); + ServiceResponse> patientAgeClassificationsResponse = patientService.findPossibleAgeClassifications(); if (patientAgeClassificationsResponse.hasErrors()){ throw new RuntimeException(); } @@ -90,7 +93,7 @@ public Result indexPopulatedGet(int patientId) { CurrentUser currentUser = sessionService.getCurrentUserSession(); //retrieve vitals names for dynamic html element naming - ServiceResponse> vitalServiceResponse = triageService.findAllVitalItems(); + ServiceResponse> vitalServiceResponse = vitalService.findAllVitalItems(); if (vitalServiceResponse.hasErrors()) { throw new RuntimeException(); } @@ -109,7 +112,7 @@ public Result indexPopulatedGet(int patientId) { } //get age classifications - ServiceResponse> patientAgeClassificationsResponse = triageService.findPossibleAgeClassifications(); + ServiceResponse> patientAgeClassificationsResponse = patientService.findPossibleAgeClassifications(); if (patientAgeClassificationsResponse.hasErrors()){ throw new RuntimeException(); } @@ -137,9 +140,9 @@ public Result indexPost(int id) { PatientItem patientItem; if (id == 0) { patientItem = populatePatientItem(viewModel, currentUser); - patientServiceResponse = triageService.createPatient(patientItem); + patientServiceResponse = patientService.createPatient(patientItem); } else { - patientServiceResponse = triageService.findPatientAndUpdateSex(id, viewModel.getSex()); + patientServiceResponse = patientService.findPatientAndUpdateSex(id, viewModel.getSex()); } if (patientServiceResponse.hasErrors()) { throw new RuntimeException(); @@ -156,7 +159,7 @@ public Result indexPost(int id) { //create and save a new encounter PatientEncounterItem patientEncounterItem = populatePatientEncounterItem(viewModel.getChiefComplaint(), viewModel.getChiefComplaintsJSON(), viewModel.getWeeksPregnant(), currentUser, patientServiceResponse.getResponseObject().getId(), viewModel.getAgeClassification()); - ServiceResponse patientEncounterServiceResponse = triageService.createPatientEncounter(patientEncounterItem); + ServiceResponse patientEncounterServiceResponse = encounterService.createPatientEncounter(patientEncounterItem); if (patientEncounterServiceResponse.hasErrors()) { throw new RuntimeException(); } else { @@ -198,7 +201,7 @@ public Result indexPost(int id) { newVitals.put("glucose", viewModel.getGlucose().floatValue()); } - ServiceResponse> vitalServiceResponse = triageService.createPatientEncounterVitalItems(newVitals, currentUser.getId(), patientEncounterItem.getId()); + ServiceResponse> vitalServiceResponse = vitalService.createPatientEncounterVitalItems(newVitals, currentUser.getId(), patientEncounterItem.getId()); if (vitalServiceResponse.hasErrors()) { throw new RuntimeException(); } diff --git a/app/femr/ui/controllers/admin/AdminController.java b/app/femr/ui/controllers/admin/AdminController.java index 1823069e5..a12e568ea 100644 --- a/app/femr/ui/controllers/admin/AdminController.java +++ b/app/femr/ui/controllers/admin/AdminController.java @@ -19,9 +19,9 @@ package femr.ui.controllers.admin; import com.google.inject.Inject; -import femr.common.dto.CurrentUser; -import femr.business.services.ISessionService; -import femr.data.models.Roles; +import femr.common.dtos.CurrentUser; +import femr.business.services.core.ISessionService; +import femr.data.models.mysql.Roles; import femr.ui.helpers.security.AllowedRoles; import femr.ui.helpers.security.FEMRAuthenticated; import femr.ui.views.html.admin.index; diff --git a/app/femr/ui/controllers/admin/ConfigureController.java b/app/femr/ui/controllers/admin/ConfigureController.java index 5d9d20e34..6cbb8a9ee 100644 --- a/app/femr/ui/controllers/admin/ConfigureController.java +++ b/app/femr/ui/controllers/admin/ConfigureController.java @@ -19,12 +19,12 @@ package femr.ui.controllers.admin; import com.google.inject.Inject; -import femr.business.services.IConfigureService; -import femr.business.services.ISessionService; -import femr.common.dto.CurrentUser; -import femr.common.dto.ServiceResponse; -import femr.data.models.ISystemSetting; -import femr.data.models.Roles; +import femr.business.services.core.IConfigureService; +import femr.business.services.core.ISessionService; +import femr.common.dtos.CurrentUser; +import femr.common.dtos.ServiceResponse; +import femr.data.models.core.ISystemSetting; +import femr.data.models.mysql.Roles; import femr.ui.helpers.security.AllowedRoles; import femr.ui.helpers.security.FEMRAuthenticated; import femr.ui.models.admin.configure.IndexViewModelGet; diff --git a/app/femr/ui/controllers/admin/InventoryController.java b/app/femr/ui/controllers/admin/InventoryController.java index 712e73b9c..727bc40ca 100644 --- a/app/femr/ui/controllers/admin/InventoryController.java +++ b/app/femr/ui/controllers/admin/InventoryController.java @@ -19,17 +19,16 @@ package femr.ui.controllers.admin; import com.google.inject.Inject; -import femr.common.dto.CurrentUser; -import femr.common.dto.ServiceResponse; -import femr.business.services.IInventoryService; -import femr.business.services.ISessionService; -import femr.data.models.Roles; +import femr.common.dtos.CurrentUser; +import femr.common.dtos.ServiceResponse; +import femr.business.services.core.IInventoryService; +import femr.business.services.core.ISessionService; +import femr.data.models.mysql.Roles; import femr.ui.helpers.security.AllowedRoles; import femr.ui.helpers.security.FEMRAuthenticated; import femr.ui.models.admin.inventory.InventoryViewModelGet; import femr.common.models.MedicationItem; import femr.ui.models.admin.inventory.InventoryViewModelPost; -import femr.ui.models.admin.users.CreateViewModel; import femr.ui.views.html.admin.inventory.index; import play.data.Form; import play.mvc.Controller; diff --git a/app/femr/ui/controllers/admin/UsersController.java b/app/femr/ui/controllers/admin/UsersController.java index d1737baa5..a349aea95 100644 --- a/app/femr/ui/controllers/admin/UsersController.java +++ b/app/femr/ui/controllers/admin/UsersController.java @@ -19,13 +19,13 @@ package femr.ui.controllers.admin; import com.google.inject.Inject; -import femr.common.dto.CurrentUser; -import femr.common.dto.ServiceResponse; -import femr.business.services.IRoleService; -import femr.business.services.ISessionService; -import femr.business.services.IUserService; +import femr.common.dtos.CurrentUser; +import femr.common.dtos.ServiceResponse; +import femr.business.services.core.IRoleService; +import femr.business.services.core.ISessionService; +import femr.business.services.core.IUserService; import femr.common.models.UserItem; -import femr.data.models.Roles; +import femr.data.models.mysql.Roles; import femr.ui.helpers.security.AllowedRoles; import femr.ui.helpers.security.FEMRAuthenticated; import femr.ui.models.admin.users.*; diff --git a/app/femr/ui/helpers/security/AllowedRolesAction.java b/app/femr/ui/helpers/security/AllowedRolesAction.java index 82440bea8..d119bf7e4 100644 --- a/app/femr/ui/helpers/security/AllowedRolesAction.java +++ b/app/femr/ui/helpers/security/AllowedRolesAction.java @@ -1,8 +1,8 @@ package femr.ui.helpers.security; import com.google.inject.Inject; -import femr.business.services.IUserService; -import femr.data.models.IRole; +import femr.business.services.core.IUserService; +import femr.data.models.core.IRole; import play.libs.F; import play.mvc.Action; import play.mvc.Http; diff --git a/app/femr/ui/models/admin/users/EditViewModel.java b/app/femr/ui/models/admin/users/EditViewModel.java index 26eff0370..41392e631 100644 --- a/app/femr/ui/models/admin/users/EditViewModel.java +++ b/app/femr/ui/models/admin/users/EditViewModel.java @@ -20,7 +20,6 @@ import femr.util.stringhelpers.StringUtils; import play.data.validation.ValidationError; - import java.util.ArrayList; import java.util.List; diff --git a/app/femr/ui/models/admin/users/IndexViewModelGet.java b/app/femr/ui/models/admin/users/IndexViewModelGet.java index 078cad869..a2b0c740d 100644 --- a/app/femr/ui/models/admin/users/IndexViewModelGet.java +++ b/app/femr/ui/models/admin/users/IndexViewModelGet.java @@ -18,7 +18,7 @@ */ package femr.ui.models.admin.users; -import femr.data.models.IUser; +import femr.data.models.core.IUser; import java.util.List; public class IndexViewModelGet { diff --git a/app/femr/ui/models/research/FilterViewModel.java b/app/femr/ui/models/research/FilterViewModel.java new file mode 100644 index 000000000..310268ceb --- /dev/null +++ b/app/femr/ui/models/research/FilterViewModel.java @@ -0,0 +1,136 @@ +package femr.ui.models.research; + +import play.data.validation.ValidationError; + +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Map; + +public class FilterViewModel { + + private String primaryDataset; + private String secondaryDataset; + private String graphType; + private String startDate; + private String endDate; + private boolean groupPrimary; + private Integer groupFactor; + private Float rangeStart; + private Float rangeEnd; + private Integer medicationId; + private Map medicationsList; + + /* + public List validate() { + + List errors = new ArrayList(); + + if (primaryDataset == null || primaryDataset.length() == 0 ) { + errors.add(new ValidationError("primaryDataset", "Choose a primary dataset")); + } + + Date startDateObj; + Date endDateObj; + Date today = new Date(); + SimpleDateFormat sqlFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + try { + + // Set Start Date to start of day + String startParseDate = startDate + " 00:00:00"; + startDateObj = sqlFormat.parse(startParseDate); + + // Set End Date to end of day + String parseEndDate = endDate + " 23:59:59"; + endDateObj = sqlFormat.parse(parseEndDate); + + } + catch(ParseException e){ + + startDateObj = new Date(); + endDateObj = new Date(); + } + + if( startDateObj.getTime() > endDateObj.getTime() ){ + + errors.add(new ValidationError("startDate", "Start Date cannot be after End Date")); + } + if( startDateObj.getTime() > today.getTime() ){ + + errors.add(new ValidationError("startDate", "Start Date cannot be in the future")); + } + if( endDateObj.getTime() > today.getTime() ){ + + errors.add(new ValidationError("endDate", "End Date cannot be in the future")); + } + + return errors.isEmpty() ? null : errors; + } + */ + + public String getPrimaryDataset() { + return primaryDataset; + } + + public void setPrimaryDataset(String primaryDataset) { + this.primaryDataset = primaryDataset; + } + + public String getSecondaryDataset() { + return secondaryDataset; + } + + public void setSecondaryDataset(String secondaryDataset) { + this.secondaryDataset = secondaryDataset; + } + + public String getGraphType() { + return graphType; + } + + public void setGraphType(String graphType) { + this.graphType = graphType; + } + + public String getStartDate() { + return startDate; + } + + public void setStartDate(String startDate) { + this.startDate = startDate; + } + + public String getEndDate() { + return endDate; + } + + public void setEndDate(String endDate) { + this.endDate = endDate; + } + + public boolean isGroupPrimary() { return groupPrimary; } + + public void setGroupPrimary(boolean groupPrimary) { this.groupPrimary = groupPrimary; } + + public Integer getGroupFactor() { return groupFactor; } + + public void setGroupFactor(Integer groupFactor) { this.groupFactor = groupFactor; } + + public Float getRangeStart() { return rangeStart; } + + public void setRangeStart(Float rangeStart) { this.rangeStart = rangeStart; } + + public Float getRangeEnd() { return rangeEnd; } + + public void setRangeEnd(Float rangeEnd) { this.rangeEnd = rangeEnd; } + + public Integer getMedicationId() { return medicationId; } + + public void setMedicationId(Integer medicationId) { this.medicationId = medicationId; } + + public Map getMedicationsList() { return medicationsList; } + + public void setMedicationsList(Map medicationsList) { this.medicationsList = medicationsList; } +} diff --git a/app/femr/ui/models/research/json/ResearchGraphDataItem.java b/app/femr/ui/models/research/json/ResearchGraphDataItem.java new file mode 100644 index 000000000..316e37b42 --- /dev/null +++ b/app/femr/ui/models/research/json/ResearchGraphDataItem.java @@ -0,0 +1,89 @@ +package femr.ui.models.research.json; + +import femr.common.models.ResearchItem; + +import java.util.List; +import java.util.Map; + +//technically shared in the service layer right now +public class ResearchGraphDataItem { + + private float average; + private float median; + private float rangeLow; + private float rangeHigh; + private List graphData; + private String xAxisTitle; + private String yAxisTitle; + private String unitOfMeasurement; + private Map primaryValuemap; + private Map secondaryValuemap; + + public float getAverage() { + return average; + } + + public void setAverage(float average) { + this.average = average; + } + + public float getMedian() { + return median; + } + + public void setMedian(float median) { + this.median = median; + } + + public float getRangeLow() { + return rangeLow; + } + + public void setRangeLow(float rangeLow) { + this.rangeLow = rangeLow; + } + + public float getRangeHigh() { + return rangeHigh; + } + + public void setRangeHigh(float rangeHigh) { + this.rangeHigh = rangeHigh; + } + + public String getxAxisTitle() { + return xAxisTitle; + } + + public void setxAxisTitle(String xAxisTitle) { + this.xAxisTitle = xAxisTitle; + } + + public String getyAxisTitle() { return yAxisTitle; } + + public void setyAxisTitle(String yAxisTitle) { this.yAxisTitle = yAxisTitle; } + + public String getUnitOfMeasurement() { + return unitOfMeasurement; + } + + public void setUnitOfMeasurement(String unitOfMeasurement) { + this.unitOfMeasurement = unitOfMeasurement; + } + + public List getGraphData() { + return graphData; + } + + public void setGraphData(List graphData) { + this.graphData = graphData; + } + + public Map getPrimaryValuemap() { return primaryValuemap; } + + public void setPrimaryValuemap(Map primaryValuemap) { this.primaryValuemap = primaryValuemap; } + + public Map getSecondaryValuemap() { return secondaryValuemap; } + + public void setSecondaryValuemap(Map secondaryValuemap) { this.secondaryValuemap = secondaryValuemap; } +} diff --git a/app/femr/ui/models/search/json/PatientSearch.java b/app/femr/ui/models/search/json/PatientSearch.java new file mode 100644 index 000000000..95f295b5d --- /dev/null +++ b/app/femr/ui/models/search/json/PatientSearch.java @@ -0,0 +1,28 @@ +package femr.ui.models.search.json; + +public class PatientSearch { + //an object designed to represent a patient while a user is searching + String id; + String firstName; + String lastName; + String age; + String photo;//the file location + + public void setId(String id){ + this.id = id; + } + public void setFirstName(String firstName){ + this.firstName = firstName; + } + public void setLastName(String lastName){ + this.lastName = lastName; + } + public void setAge(String age){ + this.age = age; + } + public void setPhoto(String photo){ + this.photo = photo; + } + + +} diff --git a/app/femr/ui/models/superuser/TripViewModelGet.java b/app/femr/ui/models/superuser/TripViewModelGet.java new file mode 100644 index 000000000..dd23192f9 --- /dev/null +++ b/app/femr/ui/models/superuser/TripViewModelGet.java @@ -0,0 +1,64 @@ +/* + fEMR - fast Electronic Medical Records + Copyright (C) 2014 Team fEMR + + fEMR is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + fEMR is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with fEMR. If not, see . If + you have any questions, contact . +*/ +package femr.ui.models.superuser; + +import femr.common.models.CityItem; +import femr.common.models.MissionItem; + +import java.util.List; + +public class TripViewModelGet { + + private List missionItems; + private List availableTeams; + private List availableCities; + private List availableCountries; + + public List getMissionItems() { + return missionItems; + } + + public void setMissionItems(List missionItems) { + this.missionItems = missionItems; + } + + public List getAvailableTeams() { + return availableTeams; + } + + public void setAvailableTeams(List availableTeams) { + this.availableTeams = availableTeams; + } + + public List getAvailableCities() { + return availableCities; + } + + public void setAvailableCities(List availableCities) { + this.availableCities = availableCities; + } + + public List getAvailableCountries() { + return availableCountries; + } + + public void setAvailableCountries(List availableCountries) { + this.availableCountries = availableCountries; + } +} diff --git a/app/femr/ui/models/superuser/TripViewModelPost.java b/app/femr/ui/models/superuser/TripViewModelPost.java new file mode 100644 index 000000000..e74656f12 --- /dev/null +++ b/app/femr/ui/models/superuser/TripViewModelPost.java @@ -0,0 +1,129 @@ +/* + fEMR - fast Electronic Medical Records + Copyright (C) 2014 Team fEMR + + fEMR is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + fEMR is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with fEMR. If not, see . If + you have any questions, contact . +*/ +package femr.ui.models.superuser; + +import java.util.Date; + +public class TripViewModelPost { + + //add team + private String newTeamName; + private String newTeamLocation; + private String newTeamDescription; + + //add city + private String newCity; + private String newCityCountry; + + //add trip + private String newTripTeamName; + private String newTripCity; + private String newTripCountry; + private Date newTripStartDate; + private Date newTripEndDate; + private Integer currentTripIdToggle; + + public String getNewTeamName() { + return newTeamName; + } + + public void setNewTeamName(String newTeamName) { + this.newTeamName = newTeamName; + } + + public String getNewTeamLocation() { + return newTeamLocation; + } + + public void setNewTeamLocation(String newTeamLocation) { + this.newTeamLocation = newTeamLocation; + } + + public String getNewTeamDescription() { + return newTeamDescription; + } + + public void setNewTeamDescription(String newTeamDescription) { + this.newTeamDescription = newTeamDescription; + } + + public String getNewTripTeamName() { + return newTripTeamName; + } + + public void setNewTripTeamName(String newTripTeamName) { + this.newTripTeamName = newTripTeamName; + } + + public String getNewTripCity() { + return newTripCity; + } + + public void setNewTripCity(String newTripCity) { + this.newTripCity = newTripCity; + } + + public String getNewTripCountry() { + return newTripCountry; + } + + public void setNewTripCountry(String newTripCountry) { + this.newTripCountry = newTripCountry; + } + + public Date getNewTripStartDate() { + return newTripStartDate; + } + + public void setNewTripStartDate(Date newTripStartDate) { + this.newTripStartDate = newTripStartDate; + } + + public Date getNewTripEndDate() { + return newTripEndDate; + } + + public void setNewTripEndDate(Date newTripEndDate) { + this.newTripEndDate = newTripEndDate; + } + + public Integer getCurrentTripIdToggle() { + return currentTripIdToggle; + } + + public void setCurrentTripIdToggle(Integer currentTripIdToggle) { + this.currentTripIdToggle = currentTripIdToggle; + } + + public String getNewCity() { + return newCity; + } + + public void setNewCity(String newCity) { + this.newCity = newCity; + } + + public String getNewCityCountry() { + return newCityCountry; + } + + public void setNewCityCountry(String newCityCountry) { + this.newCityCountry = newCityCountry; + } +} diff --git a/app/femr/ui/views/admin/configure/index.scala.html b/app/femr/ui/views/admin/configure/index.scala.html index 83253ac4f..12112ff41 100644 --- a/app/femr/ui/views/admin/configure/index.scala.html +++ b/app/femr/ui/views/admin/configure/index.scala.html @@ -1,4 +1,4 @@ -@(currentUser: femr.common.dto.CurrentUser, viewModel: femr.ui.models.admin.configure.IndexViewModelGet) +@(currentUser: femr.common.dtos.CurrentUser, viewModel: femr.ui.models.admin.configure.IndexViewModelGet) @import femr.ui.controllers.admin.routes.ConfigureController @import femr.ui.views.html.layouts.admin diff --git a/app/femr/ui/views/admin/index.scala.html b/app/femr/ui/views/admin/index.scala.html index f8ca98c4c..bb79a12d0 100644 --- a/app/femr/ui/views/admin/index.scala.html +++ b/app/femr/ui/views/admin/index.scala.html @@ -1,4 +1,4 @@ -@(currentUser: femr.common.dto.CurrentUser) +@(currentUser: femr.common.dtos.CurrentUser) @import femr.ui.views.html.layouts.admin diff --git a/app/femr/ui/views/admin/inventory/index.scala.html b/app/femr/ui/views/admin/inventory/index.scala.html index bdda7f4a2..04d2c04a3 100644 --- a/app/femr/ui/views/admin/inventory/index.scala.html +++ b/app/femr/ui/views/admin/inventory/index.scala.html @@ -1,4 +1,4 @@ -@(currentUser: femr.common.dto.CurrentUser, viewModel: femr.ui.models.admin.inventory.InventoryViewModelGet) +@(currentUser: femr.common.dtos.CurrentUser, viewModel: femr.ui.models.admin.inventory.InventoryViewModelGet) @import femr.ui.controllers.admin.routes.InventoryController @@ -37,7 +37,7 @@

- +
diff --git a/app/femr/ui/views/admin/users/create.scala.html b/app/femr/ui/views/admin/users/create.scala.html index b06bcaf0f..026e22d90 100644 --- a/app/femr/ui/views/admin/users/create.scala.html +++ b/app/femr/ui/views/admin/users/create.scala.html @@ -1,4 +1,4 @@ -@(currentUser: femr.common.dto.CurrentUser, form: play.data.Form[femr.ui.models.admin.users.CreateViewModel], messages: java.util.List[_ <: java.lang.String], availableRoles: java.util.List[_ <: java.lang.String]) +@(currentUser: femr.common.dtos.CurrentUser, form: play.data.Form[femr.ui.models.admin.users.CreateViewModel], messages: java.util.List[_ <: java.lang.String], availableRoles: java.util.List[_ <: java.lang.String]) @import views.html.helper.FieldConstructor @import femr.ui.views.html.partials.admin.inputFieldConstructor diff --git a/app/femr/ui/views/admin/users/edit.scala.html b/app/femr/ui/views/admin/users/edit.scala.html index 609590bd3..1ee67fb2f 100644 --- a/app/femr/ui/views/admin/users/edit.scala.html +++ b/app/femr/ui/views/admin/users/edit.scala.html @@ -1,4 +1,4 @@ -@(currentUser: femr.common.dto.CurrentUser, form: play.data.Form[femr.ui.models.admin.users.EditViewModel], availableRoles: java.util.List[_ <: java.lang.String], messages: java.util.List[_ <: java.lang.String]) +@(currentUser: femr.common.dtos.CurrentUser, form: play.data.Form[femr.ui.models.admin.users.EditViewModel], availableRoles: java.util.List[_ <: java.lang.String], messages: java.util.List[_ <: java.lang.String]) @import views.html.helper.FieldConstructor @import femr.ui.views.html.partials.admin.inputFieldConstructor diff --git a/app/femr/ui/views/admin/users/manage.scala.html b/app/femr/ui/views/admin/users/manage.scala.html index 57c0de4fa..ecb6d7645 100644 --- a/app/femr/ui/views/admin/users/manage.scala.html +++ b/app/femr/ui/views/admin/users/manage.scala.html @@ -1,8 +1,8 @@ -@(currentUser: femr.common.dto.CurrentUser, viewModelGet: femr.ui.models.admin.users.ManageViewModelGet) -@import femr.ui.controllers.admin.routes.UsersController +@(currentUser: femr.common.dtos.CurrentUser, viewModelGet: femr.ui.models.admin.users.ManageViewModelGet) +@import femr.ui.controllers.admin.routes.UsersController @import femr.ui.views.html.layouts.admin -@import femr.ui.views.html.partials.admin._ +@import femr.ui.views.html.partials.admin.toggleButton @additionalStyles = { @@ -50,7 +50,13 @@ @viewModelGet.getUser(y - 1).getLastLoginDate - @toggleButton(viewModelGet.getUser(y - 1)) + @defining(viewModelGet.getUser(y - 1)) { user => + @if(user.getEmail != "admin") { + @toggleButton(!user.isDeleted, user.getId) + } + + } + } diff --git a/app/femr/ui/views/history/indexEncounter.scala.html b/app/femr/ui/views/history/indexEncounter.scala.html index a84cb103e..2e132be09 100644 --- a/app/femr/ui/views/history/indexEncounter.scala.html +++ b/app/femr/ui/views/history/indexEncounter.scala.html @@ -1,4 +1,4 @@ -@(currentUser: femr.common.dto.CurrentUser, viewModel: femr.ui.models.history.IndexEncounterViewModel, viewModelMedical: femr.ui.models.history.IndexEncounterMedicalViewModel, viewModelPharmacy: femr.ui.models.history.IndexEncounterPharmacyViewModel) +@(currentUser: femr.common.dtos.CurrentUser, viewModel: femr.ui.models.history.IndexEncounterViewModel, viewModelMedical: femr.ui.models.history.IndexEncounterMedicalViewModel, viewModelPharmacy: femr.ui.models.history.IndexEncounterPharmacyViewModel) @import femr.ui.views.html.layouts.main @import femr.ui.views.html.partials.helpers.outputFloatOrNA diff --git a/app/femr/ui/views/history/indexPatient.scala.html b/app/femr/ui/views/history/indexPatient.scala.html index d65bdbf88..700b37f92 100644 --- a/app/femr/ui/views/history/indexPatient.scala.html +++ b/app/femr/ui/views/history/indexPatient.scala.html @@ -1,4 +1,4 @@ -@(currentUser: femr.common.dto.CurrentUser, searchError: java.lang.Boolean, viewModel: femr.ui.models.history.IndexPatientViewModelGet, patientEncounters: List[_ <: femr.common.models.PatientEncounterItem]) +@(currentUser: femr.common.dtos.CurrentUser, searchError: java.lang.Boolean, viewModel: femr.ui.models.history.IndexPatientViewModelGet, patientEncounters: List[_ <: femr.common.models.PatientEncounterItem]) @import femr.ui.views.html.layouts.main @import femr.ui.views.html.partials.search diff --git a/app/femr/ui/views/home/index.scala.html b/app/femr/ui/views/home/index.scala.html index 985263a2d..27e13b578 100644 --- a/app/femr/ui/views/home/index.scala.html +++ b/app/femr/ui/views/home/index.scala.html @@ -1,18 +1,30 @@ -@(currentUser: femr.common.dto.CurrentUser) +@(currentUser: femr.common.dtos.CurrentUser) @import femr.ui.views.html.layouts.main + @additionalScripts = { + + + } + + @top = {
-
-

Welcome to fEMR 2.1.2, @currentUser.getFirstName!

+
+

Welcome to fEMR 2.1.3, @currentUser.getFirstName!

@*

This is a placeholder landing page. As more features are developed, this page will change over time.

*@

Please select a tab at the top to get started!

+ +

or

+

Search Below:

+
+ +
} -@main("Home", currentUser, outsideContainerTop = top) { +@main("Home", currentUser, outsideContainerTop = top, scripts = additionalScripts) { @*
    @for(role <- currentUser.getRoles) {
  • @role.getName
    • diff --git a/app/femr/ui/views/layouts/admin.scala.html b/app/femr/ui/views/layouts/admin.scala.html index 08b91c0e8..b0c10d181 100644 --- a/app/femr/ui/views/layouts/admin.scala.html +++ b/app/femr/ui/views/layouts/admin.scala.html @@ -1,6 +1,5 @@ @(title: String, - currentUser: femr.common.dto.CurrentUser, - menus: Html = Html(""), + currentUser: femr.common.dtos.CurrentUser, styles: Html = Html(""), scripts: Html = Html(""), message: Html = Html(""), @@ -11,6 +10,7 @@ @import femr.ui.controllers.admin.routes.UsersController @import femr.ui.controllers.admin.routes.ConfigureController @import femr.ui.controllers.admin.routes.InventoryController +@import femr.ui.controllers.routes.SuperuserController @* Add scripts to script variable, how? *@ @adminScripts = { @@ -31,13 +31,16 @@ Manage Users Add User + + Configure @if(currentUser.getEmail == "superuser"){ Inventory Tracking + + Trip Tracking + + Manage Tabs } - - Configure - @menus
diff --git a/app/femr/ui/views/layouts/main.scala.html b/app/femr/ui/views/layouts/main.scala.html index 8cf8bb3d8..7936c1908 100644 --- a/app/femr/ui/views/layouts/main.scala.html +++ b/app/femr/ui/views/layouts/main.scala.html @@ -1,4 +1,4 @@ -@(title: String, currentUser: femr.common.dto.CurrentUser = null, +@(title: String, currentUser: femr.common.dtos.CurrentUser = null, styles: Html = Html(""), scripts: Html = Html(""), outsideContainerTop: Html = Html(""), outsideContainerBottom: Html = Html(""), search: Html = Html(""))(content: Html) diff --git a/app/femr/ui/views/medical/edit.scala.html b/app/femr/ui/views/medical/edit.scala.html index 3b56cf6b5..476a4d330 100644 --- a/app/femr/ui/views/medical/edit.scala.html +++ b/app/femr/ui/views/medical/edit.scala.html @@ -1,4 +1,4 @@ -@(currentUser: femr.common.dto.CurrentUser, viewModel: femr.ui.models.medical.EditViewModelGet) +@(currentUser: femr.common.dtos.CurrentUser, viewModel: femr.ui.models.medical.EditViewModelGet) @import femr.ui.controllers.routes.MedicalController @@ -15,6 +15,8 @@ } @additionalScripts = { + + diff --git a/app/femr/ui/views/medical/index.scala.html b/app/femr/ui/views/medical/index.scala.html index e4bae3174..98630046c 100644 --- a/app/femr/ui/views/medical/index.scala.html +++ b/app/femr/ui/views/medical/index.scala.html @@ -1,4 +1,4 @@ -@(currentUser: femr.common.dto.CurrentUser, message: java.lang.String, patientId: java.lang.Integer) +@(currentUser: femr.common.dtos.CurrentUser, message: java.lang.String, patientId: java.lang.Integer) @import femr.ui.controllers.routes.MedicalController @import femr.ui.views.html.layouts.main diff --git a/app/femr/ui/views/partials/admin/toggleButton.scala.html b/app/femr/ui/views/partials/admin/toggleButton.scala.html index 44f5030ea..d9988ca69 100644 --- a/app/femr/ui/views/partials/admin/toggleButton.scala.html +++ b/app/femr/ui/views/partials/admin/toggleButton.scala.html @@ -1,10 +1,7 @@ -@(user: femr.common.models.UserItem) +@(isDeactivate: java.lang.Boolean, id: java.lang.Integer) -@*Make sure you can't remove the master admin account*@ -@if(user.getEmail != "admin") { - @if(!user.isDeleted) { - - } else { - - } -} \ No newline at end of file +@if(isDeactivate) { + +} else { + +} diff --git a/app/femr/ui/views/partials/authenticated.scala.html b/app/femr/ui/views/partials/authenticated.scala.html index 24dd37a13..1069288f2 100644 --- a/app/femr/ui/views/partials/authenticated.scala.html +++ b/app/femr/ui/views/partials/authenticated.scala.html @@ -1,4 +1,4 @@ -@(currentUser: femr.common.dto.CurrentUser) +@(currentUser: femr.common.dtos.CurrentUser) @import femr.ui.views.partials.helpers.AuthenticatedPartialHelper @import femr.ui.controllers.routes.HomeController diff --git a/app/femr/ui/views/partials/footer.scala.html b/app/femr/ui/views/partials/footer.scala.html index 8ec69ccb1..a43d81765 100644 --- a/app/femr/ui/views/partials/footer.scala.html +++ b/app/femr/ui/views/partials/footer.scala.html @@ -1,4 +1,4 @@
-

fEMR 2.1.2 © 2014

+

fEMR 2.1.3 © 2015

\ No newline at end of file diff --git a/app/femr/ui/views/partials/header.scala.html b/app/femr/ui/views/partials/header.scala.html index 01fc1c059..b159bf101 100644 --- a/app/femr/ui/views/partials/header.scala.html +++ b/app/femr/ui/views/partials/header.scala.html @@ -1,4 +1,4 @@ -@(currentUser: femr.common.dto.CurrentUser = null) +@(currentUser: femr.common.dtos.CurrentUser = null) @import femr.ui.views.html.partials
diff --git a/app/femr/ui/views/partials/helpers/AuthenticatedPartialHelper.java b/app/femr/ui/views/partials/helpers/AuthenticatedPartialHelper.java index 555f19c09..b68f9104c 100644 --- a/app/femr/ui/views/partials/helpers/AuthenticatedPartialHelper.java +++ b/app/femr/ui/views/partials/helpers/AuthenticatedPartialHelper.java @@ -1,7 +1,7 @@ package femr.ui.views.partials.helpers; -import femr.data.models.IRole; -import femr.data.models.Roles; +import femr.data.models.core.IRole; +import femr.data.models.mysql.Roles; import java.util.List; diff --git a/app/femr/ui/views/partials/medical/problemField.scala.html b/app/femr/ui/views/partials/medical/problemField.scala.html index 420e6a2da..ec8f50117 100644 --- a/app/femr/ui/views/partials/medical/problemField.scala.html +++ b/app/femr/ui/views/partials/medical/problemField.scala.html @@ -2,14 +2,22 @@ @if(number == 1) { @if(value != null) { - +
+ +
} else { - +
+ +
} } else { @if(value != null) { - +
+ +
} else { - + } } \ No newline at end of file diff --git a/app/femr/ui/views/pharmacies/edit.scala.html b/app/femr/ui/views/pharmacies/edit.scala.html index a8efa1c74..0adcf7015 100644 --- a/app/femr/ui/views/pharmacies/edit.scala.html +++ b/app/femr/ui/views/pharmacies/edit.scala.html @@ -1,4 +1,4 @@ -@(currentUser: femr.common.dto.CurrentUser, viewModel: femr.ui.models.pharmacy.EditViewModelGet, searchError: java.lang.Boolean) +@(currentUser: femr.common.dtos.CurrentUser, viewModel: femr.ui.models.pharmacy.EditViewModelGet, searchError: java.lang.Boolean) @import femr.ui.controllers.routes.PharmaciesController @import femr.ui.views.html.layouts.main @@ -34,6 +34,7 @@

List of Diagnoses

@for(y <- 1 to viewModel.getProblems.size) { @if(viewModel.getProblems.get(y - 1) != null) {
  • @viewModel.getProblems.get(y - 1).getName
    • + } } } @@ -47,12 +48,21 @@

    List of Diagnoses

    List of Medications

      @for(x <- 1 to viewModel.getMedications.size) { -
    1. - - @viewModel.getMedications.get(x - 1).getName - - -
      2. + @defining(viewModel.getMedications.get(x - 1)) { medication => +
    2. + +
      + @medication.getName +
      +
      + + Prescriber: @medication.getPrescriberLastName, @medication.getPrescriberFirstName +
      + + +
      3. + } + }
    diff --git a/app/femr/ui/views/pharmacies/index.scala.html b/app/femr/ui/views/pharmacies/index.scala.html index bb53d5e53..916d53c44 100644 --- a/app/femr/ui/views/pharmacies/index.scala.html +++ b/app/femr/ui/views/pharmacies/index.scala.html @@ -1,4 +1,4 @@ -@(currentUser: femr.common.dto.CurrentUser, message: java.lang.String, patientId: java.lang.Integer) +@(currentUser: femr.common.dtos.CurrentUser, message: java.lang.String, patientId: java.lang.Integer) @import femr.ui.controllers.routes.PharmaciesController @import femr.ui.views.html.layouts.main diff --git a/app/femr/ui/views/research/generatedata.scala.html b/app/femr/ui/views/research/generatedata.scala.html new file mode 100644 index 000000000..1db030ebd --- /dev/null +++ b/app/femr/ui/views/research/generatedata.scala.html @@ -0,0 +1,19 @@ +@(currentUser: femr.common.dtos.CurrentUser, viewModel:femr.ui.models.research.FilterViewModel) + +@import femr.ui.views.html.layouts.main + + @additionalStyles = { + + } + @additionalScripts = { + + + } + +@main("Research", currentUser, styles = additionalStyles, scripts = additionalScripts) { + +

    Generate Test Data

    + How many did you want to generate:
    + + +} diff --git a/app/femr/ui/views/research/index.scala.html b/app/femr/ui/views/research/index.scala.html index ca500ec30..7368d9511 100644 --- a/app/femr/ui/views/research/index.scala.html +++ b/app/femr/ui/views/research/index.scala.html @@ -1,14 +1,223 @@ -@(currentUser: femr.common.dto.CurrentUser) +@(currentUser: femr.common.dtos.CurrentUser, viewModel:femr.ui.models.research.FilterViewModel) @import femr.ui.views.html.layouts.main +@import femr.ui.controllers.routes.ResearchController @additionalStyles = { } @additionalScripts = { + + + + + + + + + + + } @main("Research", currentUser, styles = additionalStyles, scripts = additionalScripts) { -

    Future Research Stuff

    + +
    +
    + + @helper.form(action = ResearchController.getGraphPost, 'id -> "graph-options") { +
    + +
    + + } + +
    +
    + +

    Research

    + +
    + +
    + +

    To view a graph, from the sidebar on the left:

    +
      +
    1. Choose Dataset(s)
      2. +
    2. Choose a Graph Type
      3. +
    3. Choose Filters
      4. +
    4. Click Apply
      5. +
    +
    +
    +
    +

    Average:

    +

    Median:

    +

    Range:

    + +
    + Save As Image +
    +
    +

    Choose Image Size

    + Small
    700 x 350     + Medium
    1000 x 500     + Large
    1200 x 600     +
    +
    +
    + + + + + loading… +
    +
    + + +
    + +
    + +
    + +
    + } diff --git a/app/femr/ui/views/superuser/fields.scala.html b/app/femr/ui/views/superuser/fields.scala.html index b9827a7bf..2e33ebd73 100644 --- a/app/femr/ui/views/superuser/fields.scala.html +++ b/app/femr/ui/views/superuser/fields.scala.html @@ -1,14 +1,13 @@ -@(currentUser: femr.common.dto.CurrentUser, viewModel: femr.ui.models.superuser.ContentViewModelGet) +@(currentUser: femr.common.dtos.CurrentUser, viewModel: femr.ui.models.superuser.ContentViewModelGet) @import femr.ui.views.html.layouts.admin @import femr.ui.controllers.routes.SuperuserController -@import femr.ui.views.html.superuser.superuserMenu @additionalStyles = { } -@admin("SuperUser Panel", currentUser, menus = superuserMenu(), styles = additionalStyles) { +@admin("SuperUser Panel", currentUser, styles = additionalStyles) {

    Adding content to @viewModel.getName

    diff --git a/app/femr/ui/views/superuser/index.scala.html b/app/femr/ui/views/superuser/index.scala.html index b7854666e..5c03cf11b 100644 --- a/app/femr/ui/views/superuser/index.scala.html +++ b/app/femr/ui/views/superuser/index.scala.html @@ -1,9 +1,8 @@ -@(currentUser: femr.common.dto.CurrentUser) +@(currentUser: femr.common.dtos.CurrentUser) @import femr.ui.views.html.layouts.admin -@import femr.ui.views.html.superuser.superuserMenu -@admin("SuperUser Panel", currentUser, menus = superuserMenu()) { +@admin("SuperUser Panel", currentUser) {

    Welcome, SuperUser. Choose an option to get started.

    } \ No newline at end of file diff --git a/app/femr/ui/views/superuser/superuserMenu.scala.html b/app/femr/ui/views/superuser/superuserMenu.scala.html deleted file mode 100644 index c6308f2ff..000000000 --- a/app/femr/ui/views/superuser/superuserMenu.scala.html +++ /dev/null @@ -1,6 +0,0 @@ -@() - -@import femr.ui.controllers.routes.SuperuserController - - - Manage Content \ No newline at end of file diff --git a/app/femr/ui/views/superuser/tabs.scala.html b/app/femr/ui/views/superuser/tabs.scala.html index 85fc0eb1e..cddad13b6 100644 --- a/app/femr/ui/views/superuser/tabs.scala.html +++ b/app/femr/ui/views/superuser/tabs.scala.html @@ -1,14 +1,13 @@ -@(currentUser: femr.common.dto.CurrentUser, viewModel: femr.ui.models.superuser.TabsViewModelGet) +@(currentUser: femr.common.dtos.CurrentUser, viewModel: femr.ui.models.superuser.TabsViewModelGet) @import femr.ui.views.html.layouts.admin -@import femr.ui.views.html.superuser.superuserMenu @import femr.ui.controllers.routes.SuperuserController @additionalStyles = { } -@admin("SuperUser Panel", currentUser, menus = superuserMenu(), styles = additionalStyles) { +@admin("SuperUser Panel", currentUser, styles = additionalStyles) {

    Tabs

    Do not put spaces in Tab Names.

    diff --git a/app/femr/ui/views/superuser/trips.scala.html b/app/femr/ui/views/superuser/trips.scala.html new file mode 100644 index 000000000..34e522978 --- /dev/null +++ b/app/femr/ui/views/superuser/trips.scala.html @@ -0,0 +1,150 @@ +@(currentUser: femr.common.dtos.CurrentUser, viewModel: femr.ui.models.superuser.TripViewModelGet) + +@import femr.ui.controllers.routes.SuperuserController +@import femr.ui.views.html.layouts.admin + + @additionalStyles = { + + } + + @additionalScripts = { + + } + +@admin("SuperUser Panel", currentUser, styles = additionalStyles, scripts = additionalScripts) { + @helper.form(action = SuperuserController.tripsPost()) { +

    This is where a superuser can identify the trip that is currently underway. The trip, when defined, will be linked to + the patient's encounter. The submit button will create a new team and/or city and/or trip depending on which required fields + are filled out.

    +
    +

    Add Team:

    +
    + +
    + +
    + +
    + +
    + +
    + +

    Add City:

    +
    + +
    + +
    + +
    + +
    + +
    +

    Add Trip:

    +
    + +
    +
    + +
    +
    + +
    + +
    + +
    +
    + +
    +
    +
    + +
    + } + + +
    + + + + + + + + + + + + + + @for(i <- 1 to viewModel.getMissionItems.size) { + @defining(viewModel.getMissionItems.get(i - 1)) { missionItem => + @for(tripIndex <- 1 to missionItem.getMissionTrips.size) { + @defining(missionItem.getMissionTrips.get(tripIndex - 1)) { missionTrip => + + + + + + + + + } + } + } + } + +
    TeamCountryCityStart DateEnd DateisCurrent
    @missionItem.getTeamName@missionTrip.getTripCountry@missionTrip.getTripCity@missionTrip.getFriendlyTripStartDate@missionTrip.getFriendlyTripEndDate + @if(missionTrip.isCurrent) { + Yes + } else { + + + } +
    + + +
    + + +} diff --git a/app/femr/ui/views/triage/index.scala.html b/app/femr/ui/views/triage/index.scala.html index 092f738dc..4442f490e 100644 --- a/app/femr/ui/views/triage/index.scala.html +++ b/app/femr/ui/views/triage/index.scala.html @@ -1,4 +1,4 @@ -@(currentUser: femr.common.dto.CurrentUser, viewModel: femr.ui.models.triage.IndexViewModelGet) +@(currentUser: femr.common.dtos.CurrentUser, viewModel: femr.ui.models.triage.IndexViewModelGet) @import femr.ui.views.html.layouts.main @import femr.ui.views.html.partials.search diff --git a/app/femr/util/calculations/dateUtils.java b/app/femr/util/calculations/dateUtils.java index fbba83fb6..43bef4db0 100644 --- a/app/femr/util/calculations/dateUtils.java +++ b/app/femr/util/calculations/dateUtils.java @@ -58,12 +58,26 @@ public static String getAge(Date born) { return Integer.toString(monthsInt/12) + " YO"; } + public static float getAgeFloat(Date born) { + LocalDate birthdate = new LocalDate(born); + LocalDate now = new LocalDate(); + Months months = Months.monthsBetween(birthdate, now); + int monthsInt = months.getMonths(); + float result = (float) monthsInt; + return result/12; + } + public static String getFriendlyDate(DateTime dateTime){ + if (dateTime == null) + return null; DateTimeFormatter fmt = DateTimeFormat.forPattern("MMMM d, yyyy - HH:mm:ss"); String dtStr = dateTime.toString(fmt); return dtStr; } + public static String getFriendlyDate(Date date){ + if (date == null) + return null; DateFormat df = new SimpleDateFormat("MM/dd/yyyy"); String dStr = df.format(date); return dStr; diff --git a/app/femr/util/dependencyinjection/modules/BusinessLayerModule.java b/app/femr/util/dependencyinjection/modules/BusinessLayerModule.java index 59544caf4..3bbaaed8a 100644 --- a/app/femr/util/dependencyinjection/modules/BusinessLayerModule.java +++ b/app/femr/util/dependencyinjection/modules/BusinessLayerModule.java @@ -19,28 +19,30 @@ package femr.util.dependencyinjection.modules; import com.google.inject.AbstractModule; -import femr.business.services.*; +import femr.business.services.core.*; +import femr.business.services.system.*; import femr.business.wrappers.sessions.ISessionHelper; import femr.business.wrappers.sessions.SessionHelper; -import femr.data.models.ISystemSetting; public class BusinessLayerModule extends AbstractModule { @Override protected void configure() { //Business Service Injection + bind(IConfigureService.class).to(ConfigureService.class); + bind(ICustomTabService.class).to(CustomTabService.class); + bind(IEncounterService.class).to(EncounterService.class); bind(IInventoryService.class).to(InventoryService.class); - bind(IMedicalService.class).to(MedicalService.class); - bind(IPharmacyService.class).to(PharmacyService.class); + bind(IMedicationService.class).to(MedicationService.class); + bind(IMissionTripService.class).to(MissionTripService.class); + bind(IPatientService.class).to(PatientService.class); bind(IPhotoService.class).to(PhotoService.class); bind(IResearchService.class).to(ResearchService.class); bind(IRoleService.class).to(RoleService.class); bind(ISearchService.class).to(SearchService.class); bind(ISessionHelper.class).to(SessionHelper.class); bind(ISessionService.class).to(SessionService.class); - bind(IConfigureService.class).to(ConfigureService.class); - bind(ISuperuserService.class).to(SuperuserService.class); - bind(ITriageService.class).to(TriageService.class); bind(IUserService.class).to(UserService.class); + bind(IVitalService.class).to(VitalService.class); } } diff --git a/app/femr/util/dependencyinjection/modules/DataLayerModule.java b/app/femr/util/dependencyinjection/modules/DataLayerModule.java index 4b7a109f6..d77b8b87c 100644 --- a/app/femr/util/dependencyinjection/modules/DataLayerModule.java +++ b/app/femr/util/dependencyinjection/modules/DataLayerModule.java @@ -20,10 +20,9 @@ import com.google.inject.AbstractModule; import com.google.inject.TypeLiteral; -import femr.data.models.IUser; +import femr.data.models.core.*; import femr.data.daos.IRepository; import femr.data.daos.Repository; -import femr.data.models.*; import femr.util.dependencyinjection.providers.*; public class DataLayerModule extends AbstractModule { @@ -32,12 +31,17 @@ public class DataLayerModule extends AbstractModule { protected void configure() { //Provider Injection bind(IChiefComplaint.class).toProvider(ChiefComplaintProvider.class); + bind(IDiagnosis.class).toProvider(DiagnosisProvider.class); bind(IMedication.class).toProvider(MedicationProvider.class); bind(IMedicationActiveDrug.class).toProvider(MedicationActiveDrugProvider.class); bind(IMedicationActiveDrugName.class).toProvider(MedicationActiveDrugNameProvider.class); bind(IMedicationAdministration.class).toProvider(MedicationAdministrationProvider.class); bind(IMedicationForm.class).toProvider(MedicationFormProvider.class); bind(IMedicationMeasurementUnit.class).toProvider(MedicationMeasurementUnitProvider.class); + bind(IMissionCity.class).toProvider(MissionCityProvider.class); + bind(IMissionCountry.class).toProvider(MissionCountryProvider.class); + bind(IMissionTeam.class).toProvider(MissionTeamProvider.class); + bind(IMissionTrip.class).toProvider(MissionTripProvider.class); bind(IPatient.class).toProvider(PatientProvider.class); bind(IPatientAgeClassification.class).toProvider(PatientAgeClassificationProvider.class); bind(IPatientEncounter.class).toProvider(PatientEncounterProvider.class); @@ -58,12 +62,17 @@ protected void configure() { //Repository Injection bind(new TypeLiteral>() {}).to(new TypeLiteral>() {}); + bind(new TypeLiteral>() {}).to(new TypeLiteral>() {}); bind(new TypeLiteral>() {}).to(new TypeLiteral>() {}); bind(new TypeLiteral>() {}).to(new TypeLiteral>() {}); bind(new TypeLiteral>() {}).to(new TypeLiteral>() {}); bind(new TypeLiteral>() {}).to(new TypeLiteral>() {}); bind(new TypeLiteral>() {}).to(new TypeLiteral>() {}); bind(new TypeLiteral>() {}).to(new TypeLiteral>() {}); + bind(new TypeLiteral>() {}).to(new TypeLiteral>() {}); + bind(new TypeLiteral>() {}).to(new TypeLiteral>() {}); + bind(new TypeLiteral>() {}).to(new TypeLiteral>() {}); + bind(new TypeLiteral>() {}).to(new TypeLiteral>() {}); bind(new TypeLiteral>() {}).to(new TypeLiteral>() {}); bind(new TypeLiteral>() {}).to(new TypeLiteral>() {}); bind(new TypeLiteral>() {}).to(new TypeLiteral>() {}); diff --git a/app/femr/util/dependencyinjection/providers/ChiefComplaintProvider.java b/app/femr/util/dependencyinjection/providers/ChiefComplaintProvider.java index a6bbd2d00..fae7397e1 100644 --- a/app/femr/util/dependencyinjection/providers/ChiefComplaintProvider.java +++ b/app/femr/util/dependencyinjection/providers/ChiefComplaintProvider.java @@ -19,8 +19,8 @@ package femr.util.dependencyinjection.providers; import com.google.inject.Provider; -import femr.data.models.ChiefComplaint; -import femr.data.models.IChiefComplaint; +import femr.data.models.mysql.ChiefComplaint; +import femr.data.models.core.IChiefComplaint; public class ChiefComplaintProvider implements Provider { diff --git a/app/femr/business/services/ResearchService.java b/app/femr/util/dependencyinjection/providers/DiagnosisProvider.java similarity index 69% rename from app/femr/business/services/ResearchService.java rename to app/femr/util/dependencyinjection/providers/DiagnosisProvider.java index e4bf4ad64..0f3ece60e 100644 --- a/app/femr/business/services/ResearchService.java +++ b/app/femr/util/dependencyinjection/providers/DiagnosisProvider.java @@ -16,23 +16,15 @@ along with fEMR. If not, see . If you have any questions, contact . */ -package femr.business.services; +package femr.util.dependencyinjection.providers; -import com.google.inject.Inject; - -public class ResearchService implements IResearchService{ - - /** - * Initializes the research service and injects the dependence - */ - @Inject - public ResearchService() { - //TODO: Inject research related repositories +import com.google.inject.Provider; +import femr.data.models.core.IDiagnosis; +import femr.data.models.mysql.Diagnosis; +public class DiagnosisProvider implements Provider { + @Override + public IDiagnosis get() { + return new Diagnosis(); } - - //TODO: Implement research business logic - - - } diff --git a/app/femr/util/dependencyinjection/providers/MedicationActiveDrugNameProvider.java b/app/femr/util/dependencyinjection/providers/MedicationActiveDrugNameProvider.java index 95cf70325..00a09df22 100644 --- a/app/femr/util/dependencyinjection/providers/MedicationActiveDrugNameProvider.java +++ b/app/femr/util/dependencyinjection/providers/MedicationActiveDrugNameProvider.java @@ -19,8 +19,8 @@ package femr.util.dependencyinjection.providers; import com.google.inject.Provider; -import femr.data.models.IMedicationActiveDrugName; -import femr.data.models.MedicationActiveDrugName; +import femr.data.models.core.IMedicationActiveDrugName; +import femr.data.models.mysql.MedicationActiveDrugName; public class MedicationActiveDrugNameProvider implements Provider { @Override diff --git a/app/femr/util/dependencyinjection/providers/MedicationActiveDrugProvider.java b/app/femr/util/dependencyinjection/providers/MedicationActiveDrugProvider.java index 25307fc2a..668a30c08 100644 --- a/app/femr/util/dependencyinjection/providers/MedicationActiveDrugProvider.java +++ b/app/femr/util/dependencyinjection/providers/MedicationActiveDrugProvider.java @@ -19,7 +19,7 @@ package femr.util.dependencyinjection.providers; import com.google.inject.Provider; -import femr.data.models.MedicationActiveDrug; +import femr.data.models.mysql.MedicationActiveDrug; public class MedicationActiveDrugProvider implements Provider { @Override diff --git a/app/femr/util/dependencyinjection/providers/MedicationAdministrationProvider.java b/app/femr/util/dependencyinjection/providers/MedicationAdministrationProvider.java index 45519c9da..3da15b459 100644 --- a/app/femr/util/dependencyinjection/providers/MedicationAdministrationProvider.java +++ b/app/femr/util/dependencyinjection/providers/MedicationAdministrationProvider.java @@ -19,8 +19,8 @@ package femr.util.dependencyinjection.providers; import com.google.inject.Provider; -import femr.data.models.IMedicationAdministration; -import femr.data.models.MedicationAdministration; +import femr.data.models.core.IMedicationAdministration; +import femr.data.models.mysql.MedicationAdministration; public class MedicationAdministrationProvider implements Provider { @Override diff --git a/app/femr/util/dependencyinjection/providers/MedicationFormProvider.java b/app/femr/util/dependencyinjection/providers/MedicationFormProvider.java index 761bd3615..92cbccc4c 100644 --- a/app/femr/util/dependencyinjection/providers/MedicationFormProvider.java +++ b/app/femr/util/dependencyinjection/providers/MedicationFormProvider.java @@ -19,7 +19,7 @@ package femr.util.dependencyinjection.providers; import com.google.inject.Provider; -import femr.data.models.MedicationForm; +import femr.data.models.mysql.MedicationForm; public class MedicationFormProvider implements Provider { @Override diff --git a/app/femr/util/dependencyinjection/providers/MedicationMeasurementUnitProvider.java b/app/femr/util/dependencyinjection/providers/MedicationMeasurementUnitProvider.java index 90ea5b24e..eb566cd6f 100644 --- a/app/femr/util/dependencyinjection/providers/MedicationMeasurementUnitProvider.java +++ b/app/femr/util/dependencyinjection/providers/MedicationMeasurementUnitProvider.java @@ -18,7 +18,7 @@ */ package femr.util.dependencyinjection.providers; -import femr.data.models.MedicationMeasurementUnit; +import femr.data.models.mysql.MedicationMeasurementUnit; import com.google.inject.Provider; public class MedicationMeasurementUnitProvider implements Provider { diff --git a/app/femr/util/dependencyinjection/providers/MedicationProvider.java b/app/femr/util/dependencyinjection/providers/MedicationProvider.java index 51d4bee1f..681a6d105 100644 --- a/app/femr/util/dependencyinjection/providers/MedicationProvider.java +++ b/app/femr/util/dependencyinjection/providers/MedicationProvider.java @@ -19,8 +19,8 @@ package femr.util.dependencyinjection.providers; import com.google.inject.Provider; -import femr.data.models.IMedication; -import femr.data.models.Medication; +import femr.data.models.core.IMedication; +import femr.data.models.mysql.Medication; public class MedicationProvider implements Provider { @Override diff --git a/app/femr/util/dependencyinjection/providers/MissionCityProvider.java b/app/femr/util/dependencyinjection/providers/MissionCityProvider.java new file mode 100644 index 000000000..2dfadc8ef --- /dev/null +++ b/app/femr/util/dependencyinjection/providers/MissionCityProvider.java @@ -0,0 +1,30 @@ +/* + fEMR - fast Electronic Medical Records + Copyright (C) 2014 Team fEMR + + fEMR is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + fEMR is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with fEMR. If not, see . If + you have any questions, contact . +*/ +package femr.util.dependencyinjection.providers; + +import com.google.inject.Provider; +import femr.data.models.core.IMissionCity; +import femr.data.models.mysql.MissionCity; + +public class MissionCityProvider implements Provider { + @Override + public IMissionCity get() { + return new MissionCity(); + } +} diff --git a/app/femr/util/dependencyinjection/providers/MissionCountryProvider.java b/app/femr/util/dependencyinjection/providers/MissionCountryProvider.java new file mode 100644 index 000000000..5bd71220b --- /dev/null +++ b/app/femr/util/dependencyinjection/providers/MissionCountryProvider.java @@ -0,0 +1,30 @@ +/* + fEMR - fast Electronic Medical Records + Copyright (C) 2014 Team fEMR + + fEMR is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + fEMR is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with fEMR. If not, see . If + you have any questions, contact . +*/ +package femr.util.dependencyinjection.providers; + +import com.google.inject.Provider; +import femr.data.models.core.IMissionCountry; +import femr.data.models.mysql.MissionCountry; + +public class MissionCountryProvider implements Provider { + @Override + public IMissionCountry get() { + return new MissionCountry(); + } +} diff --git a/app/femr/util/dependencyinjection/providers/MissionTeamProvider.java b/app/femr/util/dependencyinjection/providers/MissionTeamProvider.java new file mode 100644 index 000000000..a4be0936e --- /dev/null +++ b/app/femr/util/dependencyinjection/providers/MissionTeamProvider.java @@ -0,0 +1,30 @@ +/* + fEMR - fast Electronic Medical Records + Copyright (C) 2014 Team fEMR + + fEMR is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + fEMR is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with fEMR. If not, see . If + you have any questions, contact . +*/ +package femr.util.dependencyinjection.providers; + +import com.google.inject.Provider; +import femr.data.models.core.IMissionTeam; +import femr.data.models.mysql.MissionTeam; + +public class MissionTeamProvider implements Provider { + @Override + public IMissionTeam get() { + return new MissionTeam(); + } +} diff --git a/app/femr/util/dependencyinjection/providers/MissionTripProvider.java b/app/femr/util/dependencyinjection/providers/MissionTripProvider.java new file mode 100644 index 000000000..64bbde213 --- /dev/null +++ b/app/femr/util/dependencyinjection/providers/MissionTripProvider.java @@ -0,0 +1,30 @@ +/* + fEMR - fast Electronic Medical Records + Copyright (C) 2014 Team fEMR + + fEMR is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + fEMR is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with fEMR. If not, see . If + you have any questions, contact . +*/ +package femr.util.dependencyinjection.providers; + +import com.google.inject.Provider; +import femr.data.models.core.IMissionTrip; +import femr.data.models.mysql.MissionTrip; + +public class MissionTripProvider implements Provider { + @Override + public IMissionTrip get() { + return new MissionTrip(); + } +} diff --git a/app/femr/util/dependencyinjection/providers/PatientAgeClassificationProvider.java b/app/femr/util/dependencyinjection/providers/PatientAgeClassificationProvider.java index 45d50dc87..b9e49725e 100644 --- a/app/femr/util/dependencyinjection/providers/PatientAgeClassificationProvider.java +++ b/app/femr/util/dependencyinjection/providers/PatientAgeClassificationProvider.java @@ -19,8 +19,8 @@ package femr.util.dependencyinjection.providers; import com.google.inject.Provider; -import femr.data.models.IPatientAgeClassification; -import femr.data.models.PatientAgeClassification; +import femr.data.models.core.IPatientAgeClassification; +import femr.data.models.mysql.PatientAgeClassification; public class PatientAgeClassificationProvider implements Provider { @Override diff --git a/app/femr/util/dependencyinjection/providers/PatientEncounterPhotoProvider.java b/app/femr/util/dependencyinjection/providers/PatientEncounterPhotoProvider.java index 01076788f..52be56a9a 100644 --- a/app/femr/util/dependencyinjection/providers/PatientEncounterPhotoProvider.java +++ b/app/femr/util/dependencyinjection/providers/PatientEncounterPhotoProvider.java @@ -18,8 +18,8 @@ */ package femr.util.dependencyinjection.providers; -import femr.data.models.IPatientEncounterPhoto; -import femr.data.models.PatientEncounterPhoto; +import femr.data.models.core.IPatientEncounterPhoto; +import femr.data.models.mysql.PatientEncounterPhoto; import javax.inject.Provider; diff --git a/app/femr/util/dependencyinjection/providers/PatientEncounterProvider.java b/app/femr/util/dependencyinjection/providers/PatientEncounterProvider.java index d4e3c2a6c..c1828a36b 100644 --- a/app/femr/util/dependencyinjection/providers/PatientEncounterProvider.java +++ b/app/femr/util/dependencyinjection/providers/PatientEncounterProvider.java @@ -19,8 +19,8 @@ package femr.util.dependencyinjection.providers; import com.google.inject.Provider; -import femr.data.models.IPatientEncounter; -import femr.data.models.PatientEncounter; +import femr.data.models.core.IPatientEncounter; +import femr.data.models.mysql.PatientEncounter; public class PatientEncounterProvider implements Provider { @Override diff --git a/app/femr/util/dependencyinjection/providers/PatientEncounterTabFieldProvider.java b/app/femr/util/dependencyinjection/providers/PatientEncounterTabFieldProvider.java index 14ff43f47..988012fba 100644 --- a/app/femr/util/dependencyinjection/providers/PatientEncounterTabFieldProvider.java +++ b/app/femr/util/dependencyinjection/providers/PatientEncounterTabFieldProvider.java @@ -18,8 +18,8 @@ */ package femr.util.dependencyinjection.providers; -import femr.data.models.IPatientEncounterTabField; -import femr.data.models.PatientEncounterTabField; +import femr.data.models.core.IPatientEncounterTabField; +import femr.data.models.mysql.PatientEncounterTabField; import javax.inject.Provider; diff --git a/app/femr/util/dependencyinjection/providers/PatientEncounterVitalProvider.java b/app/femr/util/dependencyinjection/providers/PatientEncounterVitalProvider.java index 1c45f6d4f..8a1561997 100644 --- a/app/femr/util/dependencyinjection/providers/PatientEncounterVitalProvider.java +++ b/app/femr/util/dependencyinjection/providers/PatientEncounterVitalProvider.java @@ -19,8 +19,8 @@ package femr.util.dependencyinjection.providers; import com.google.inject.Provider; -import femr.data.models.IPatientEncounterVital; -import femr.data.models.PatientEncounterVital; +import femr.data.models.core.IPatientEncounterVital; +import femr.data.models.mysql.PatientEncounterVital; public class PatientEncounterVitalProvider implements Provider { @Override diff --git a/app/femr/util/dependencyinjection/providers/PatientPrescriptionProvider.java b/app/femr/util/dependencyinjection/providers/PatientPrescriptionProvider.java index 92dc0c3a9..dc8ee31a1 100644 --- a/app/femr/util/dependencyinjection/providers/PatientPrescriptionProvider.java +++ b/app/femr/util/dependencyinjection/providers/PatientPrescriptionProvider.java @@ -19,8 +19,8 @@ package femr.util.dependencyinjection.providers; import com.google.inject.Provider; -import femr.data.models.IPatientPrescription; -import femr.data.models.PatientPrescription; +import femr.data.models.core.IPatientPrescription; +import femr.data.models.mysql.PatientPrescription; public class PatientPrescriptionProvider implements Provider { @Override diff --git a/app/femr/util/dependencyinjection/providers/PatientProvider.java b/app/femr/util/dependencyinjection/providers/PatientProvider.java index 8e803332e..bf12e8497 100644 --- a/app/femr/util/dependencyinjection/providers/PatientProvider.java +++ b/app/femr/util/dependencyinjection/providers/PatientProvider.java @@ -19,8 +19,8 @@ package femr.util.dependencyinjection.providers; import com.google.inject.Provider; -import femr.data.models.IPatient; -import femr.data.models.Patient; +import femr.data.models.core.IPatient; +import femr.data.models.mysql.Patient; public class PatientProvider implements Provider { @Override diff --git a/app/femr/util/dependencyinjection/providers/PhotoProvider.java b/app/femr/util/dependencyinjection/providers/PhotoProvider.java index 4b1a21728..b31d06c9c 100644 --- a/app/femr/util/dependencyinjection/providers/PhotoProvider.java +++ b/app/femr/util/dependencyinjection/providers/PhotoProvider.java @@ -18,8 +18,8 @@ */ package femr.util.dependencyinjection.providers; -import femr.data.models.IPhoto; -import femr.data.models.Photo; +import femr.data.models.core.IPhoto; +import femr.data.models.mysql.Photo; import javax.inject.Provider; diff --git a/app/femr/util/dependencyinjection/providers/RoleProvider.java b/app/femr/util/dependencyinjection/providers/RoleProvider.java index 58ef8816f..72d53c8ba 100644 --- a/app/femr/util/dependencyinjection/providers/RoleProvider.java +++ b/app/femr/util/dependencyinjection/providers/RoleProvider.java @@ -19,8 +19,8 @@ package femr.util.dependencyinjection.providers; import com.google.inject.Provider; -import femr.data.models.IRole; -import femr.data.models.Role; +import femr.data.models.core.IRole; +import femr.data.models.mysql.Role; public class RoleProvider implements Provider { @Override diff --git a/app/femr/util/dependencyinjection/providers/SystemSettingProvider.java b/app/femr/util/dependencyinjection/providers/SystemSettingProvider.java index d06f2fb2f..d266a2ad6 100644 --- a/app/femr/util/dependencyinjection/providers/SystemSettingProvider.java +++ b/app/femr/util/dependencyinjection/providers/SystemSettingProvider.java @@ -19,8 +19,8 @@ package femr.util.dependencyinjection.providers; import com.google.inject.Provider; -import femr.data.models.ISystemSetting; -import femr.data.models.SystemSetting; +import femr.data.models.core.ISystemSetting; +import femr.data.models.mysql.SystemSetting; public class SystemSettingProvider implements Provider { @Override diff --git a/app/femr/util/dependencyinjection/providers/TabFieldProvider.java b/app/femr/util/dependencyinjection/providers/TabFieldProvider.java index 962f790ff..07acfc9c4 100644 --- a/app/femr/util/dependencyinjection/providers/TabFieldProvider.java +++ b/app/femr/util/dependencyinjection/providers/TabFieldProvider.java @@ -18,8 +18,8 @@ */ package femr.util.dependencyinjection.providers; -import femr.data.models.ITabField; -import femr.data.models.TabField; +import femr.data.models.core.ITabField; +import femr.data.models.mysql.TabField; import javax.inject.Provider; diff --git a/app/femr/util/dependencyinjection/providers/TabFieldSizeProvider.java b/app/femr/util/dependencyinjection/providers/TabFieldSizeProvider.java index 77737796a..6a8f9c39e 100644 --- a/app/femr/util/dependencyinjection/providers/TabFieldSizeProvider.java +++ b/app/femr/util/dependencyinjection/providers/TabFieldSizeProvider.java @@ -19,8 +19,8 @@ package femr.util.dependencyinjection.providers; import com.google.inject.Provider; -import femr.data.models.ITabFieldSize; -import femr.data.models.TabFieldSize; +import femr.data.models.core.ITabFieldSize; +import femr.data.models.mysql.TabFieldSize; public class TabFieldSizeProvider implements Provider { @Override diff --git a/app/femr/util/dependencyinjection/providers/TabFieldTypeProvider.java b/app/femr/util/dependencyinjection/providers/TabFieldTypeProvider.java index 125bf3679..25ece147e 100644 --- a/app/femr/util/dependencyinjection/providers/TabFieldTypeProvider.java +++ b/app/femr/util/dependencyinjection/providers/TabFieldTypeProvider.java @@ -18,8 +18,8 @@ */ package femr.util.dependencyinjection.providers; -import femr.data.models.ITabFieldType; -import femr.data.models.TabFieldType; +import femr.data.models.core.ITabFieldType; +import femr.data.models.mysql.TabFieldType; import javax.inject.Provider; diff --git a/app/femr/util/dependencyinjection/providers/TabProvider.java b/app/femr/util/dependencyinjection/providers/TabProvider.java index 559ceb69f..1b8ab61ec 100644 --- a/app/femr/util/dependencyinjection/providers/TabProvider.java +++ b/app/femr/util/dependencyinjection/providers/TabProvider.java @@ -18,8 +18,8 @@ */ package femr.util.dependencyinjection.providers; -import femr.data.models.ITab; -import femr.data.models.Tab; +import femr.data.models.core.ITab; +import femr.data.models.mysql.Tab; import javax.inject.Provider; diff --git a/app/femr/util/dependencyinjection/providers/UserProvider.java b/app/femr/util/dependencyinjection/providers/UserProvider.java index c8e9936a4..8efb9c9dc 100644 --- a/app/femr/util/dependencyinjection/providers/UserProvider.java +++ b/app/femr/util/dependencyinjection/providers/UserProvider.java @@ -19,8 +19,8 @@ package femr.util.dependencyinjection.providers; import com.google.inject.Provider; -import femr.data.models.IUser; -import femr.data.models.User; +import femr.data.models.core.IUser; +import femr.data.models.mysql.User; public class UserProvider implements Provider { @Override diff --git a/app/femr/util/dependencyinjection/providers/VitalProvider.java b/app/femr/util/dependencyinjection/providers/VitalProvider.java index 216a3161d..eb6f09c61 100644 --- a/app/femr/util/dependencyinjection/providers/VitalProvider.java +++ b/app/femr/util/dependencyinjection/providers/VitalProvider.java @@ -19,8 +19,8 @@ package femr.util.dependencyinjection.providers; import com.google.inject.Provider; -import femr.data.models.IVital; -import femr.data.models.Vital; +import femr.data.models.core.IVital; +import femr.data.models.mysql.Vital; public class VitalProvider implements Provider { @Override diff --git a/app/femr/util/startup/DatabaseSeeder.java b/app/femr/util/startup/DatabaseSeeder.java index 5d517ea97..066199c06 100644 --- a/app/femr/util/startup/DatabaseSeeder.java +++ b/app/femr/util/startup/DatabaseSeeder.java @@ -21,7 +21,8 @@ import com.avaje.ebean.Ebean; import femr.data.daos.IRepository; import femr.data.daos.Repository; -import femr.data.models.*; +import femr.data.models.core.*; +import femr.data.models.mysql.*; import femr.util.calculations.dateUtils; import femr.util.encryptions.BCryptPasswordEncryptor; import femr.util.encryptions.IPasswordEncryptor; @@ -32,8 +33,12 @@ public class DatabaseSeeder { + private final Repository diagnosisRepository; private final Repository medicationMeasurementUnitRepository; private final Repository medicationFormRepository; + private final IRepository missionCountryRepository; + private final IRepository missionCityRepository; + private final IRepository missionTeamRepository; private final IRepository userRepository; private final Repository roleRepository; private final Repository systemSettingRepository; @@ -44,6 +49,7 @@ public class DatabaseSeeder { private final Repository patientAgeClassificationRepository; public DatabaseSeeder() { + diagnosisRepository = new Repository<>(); medicationMeasurementUnitRepository = new Repository<>(); medicationFormRepository = new Repository<>(); userRepository = new Repository<>(); @@ -54,9 +60,13 @@ public DatabaseSeeder() { tabFieldTypeRepository = new Repository<>(); tabRepository = new Repository<>(); patientAgeClassificationRepository = new Repository<>(); + missionCountryRepository = new Repository<>(); + missionTeamRepository = new Repository<>(); + missionCityRepository = new Repository<>(); } public void seed() { + seedMissionTripInformation(); seedSystemSettings(); seedAdminUser(); seedDefaultTabNames(); @@ -65,6 +75,397 @@ public void seed() { seedMedicationUnits(); seedMedicationForms(); seedPatientAgeClassification(); + seedDiagnosis(); + } + + private void seedDiagnosis() { + List diagnosis_but_plural = diagnosisRepository.findAll(Diagnosis.class); + List availableDiagnosis = new ArrayList<>(); + + availableDiagnosis.add("Acne Vulgaris"); + availableDiagnosis.add("Allergies"); + availableDiagnosis.add("Amenorrhea"); + availableDiagnosis.add("Anemia, Iron Deficiency"); + availableDiagnosis.add("Anemia, Sickle Cell"); + availableDiagnosis.add("Anxiety Disorder"); + availableDiagnosis.add("Arthritis, Osteo"); + availableDiagnosis.add("Arthritis, Rheumatoid"); + availableDiagnosis.add("Ascites"); + availableDiagnosis.add("Asthma"); + availableDiagnosis.add("Bacterial Infection, Abscess"); + availableDiagnosis.add("Bacterial Infection, Skin"); + availableDiagnosis.add("Bacterial Vaginosis"); + availableDiagnosis.add("Trichomonas Vaginalis"); + availableDiagnosis.add("Benign Prostatic Hyperplasia"); + availableDiagnosis.add("Bronchitis"); + availableDiagnosis.add("Bursitis"); + availableDiagnosis.add("Cataracts"); + availableDiagnosis.add("Cerebral Palsy"); + availableDiagnosis.add("Chlamydia"); + availableDiagnosis.add("Chronic Obstructive Pulmonary Disease"); + availableDiagnosis.add("Constipation"); + availableDiagnosis.add("Contact Dermatitis"); + availableDiagnosis.add("Cough"); + availableDiagnosis.add("Conjuctivitis"); + availableDiagnosis.add("Cystitis"); + availableDiagnosis.add("Dehydration"); + availableDiagnosis.add("Dental, Abscess"); + availableDiagnosis.add("Dental, Chipped Tooth"); + availableDiagnosis.add("Dental, Gingivitis"); + availableDiagnosis.add("Dental, Infection"); + availableDiagnosis.add("Dental, Pain"); + availableDiagnosis.add("Depression"); + availableDiagnosis.add("Diabetes Mellitus, Type 1"); + availableDiagnosis.add("Diabetes mellitus, Type 2"); + availableDiagnosis.add("Diarrhea"); + availableDiagnosis.add("Dizziness"); + availableDiagnosis.add("Dry Eyes"); + availableDiagnosis.add("Dry Skin"); + availableDiagnosis.add("Dysmenorrhea"); + availableDiagnosis.add("Dysuria"); + availableDiagnosis.add("Ear Infection (not Otitis Media)"); + availableDiagnosis.add("Eczema"); + availableDiagnosis.add("Fever"); + availableDiagnosis.add("Folliculitis"); + availableDiagnosis.add("Gastric Ulcer"); + availableDiagnosis.add("Gastritis"); + availableDiagnosis.add("Gastroenteritis"); + availableDiagnosis.add("Gastroesophageal Reflux Disease"); + availableDiagnosis.add("Headache"); + availableDiagnosis.add("Herpangina"); + availableDiagnosis.add("Herpes Simplex Virus, Oral"); + availableDiagnosis.add("Herpes Simplex Virus, Genital"); + availableDiagnosis.add("High Blood Pressure"); + availableDiagnosis.add("Hypertension"); + availableDiagnosis.add("Irregular Menstruation"); + availableDiagnosis.add("Laceration"); + availableDiagnosis.add("Lipoma"); + availableDiagnosis.add("Lymphadenitis"); + availableDiagnosis.add("Malaria"); + availableDiagnosis.add("Malnutrition"); + availableDiagnosis.add("Melena"); + availableDiagnosis.add("Nausea"); + availableDiagnosis.add("Neuropathy"); + availableDiagnosis.add("Orthostatic Hypotension"); + availableDiagnosis.add("Otitis Media"); + availableDiagnosis.add("Pain, Abdominal"); + availableDiagnosis.add("Pain, Arm"); + availableDiagnosis.add("Pain, Bone"); + availableDiagnosis.add("Pain, Breast"); + availableDiagnosis.add("Pain, Costrochondral"); + availableDiagnosis.add("Pain, Ear"); + availableDiagnosis.add("Pain, Eye"); + availableDiagnosis.add("Pain, Foot"); + availableDiagnosis.add("Pain, Generalized"); + availableDiagnosis.add("Pain, Joint"); + availableDiagnosis.add("Pain, Knee"); + availableDiagnosis.add("Pain, Leg"); + availableDiagnosis.add("Pain, Muscle"); + availableDiagnosis.add("Parasitic Infection"); + availableDiagnosis.add("Pelvic Inflammatory Disease"); + availableDiagnosis.add("Pharyngitis, Bacterial"); + availableDiagnosis.add("Pharyngitis, Viral"); + availableDiagnosis.add("Phimosis"); + availableDiagnosis.add("Pneumonia"); + availableDiagnosis.add("Pregnancy"); + availableDiagnosis.add("Prostitis"); + availableDiagnosis.add("Psoriasis"); + availableDiagnosis.add("Pylonephritis"); + availableDiagnosis.add("Scabies"); + availableDiagnosis.add("Sebhorragic Dermatitis"); + availableDiagnosis.add("Seizure Disorder"); + availableDiagnosis.add("Shortness of Breath"); + availableDiagnosis.add("Angina Pectoris, Stable"); + availableDiagnosis.add("Angina Pectoris, Unstable"); + availableDiagnosis.add("Sinusitis"); + availableDiagnosis.add("Sty"); + availableDiagnosis.add("Syphilis"); + availableDiagnosis.add("Thelarche"); + availableDiagnosis.add("Tinea Capitis"); + availableDiagnosis.add("Tinea Corporis"); + availableDiagnosis.add("Tinea Cruris"); + availableDiagnosis.add("Tinea Legionella"); + availableDiagnosis.add("Tinea Versicolor"); + availableDiagnosis.add("Urinary Tract Infection"); + availableDiagnosis.add("Uterine Fibroids"); + availableDiagnosis.add("Uterine Prolapse"); + availableDiagnosis.add("Candiasis, Vaginal"); + availableDiagnosis.add("Candiasis, Oral"); + availableDiagnosis.add("Candiasis, Cutaneous"); + + List newDiagnosis = new ArrayList<>(); + Diagnosis diagnosis; + for (String diag : availableDiagnosis) + if (diagnosis_but_plural != null && !containDiagnosis(diagnosis_but_plural, diag)) { + diagnosis = new Diagnosis(); + diagnosis.setName(diag); + newDiagnosis.add(diagnosis); + } + diagnosisRepository.createAll(newDiagnosis); + } + + private void seedMissionTripInformation() { + //mission countries + List missionCountries = missionCountryRepository.findAll(MissionCountry.class); + List availableCountries = new ArrayList<>(); + + availableCountries.add("Afghanistan"); + availableCountries.add("Albania"); + availableCountries.add("Algeria"); + availableCountries.add("Andorra"); + availableCountries.add("Angola"); + availableCountries.add("Antigua & Deps"); + availableCountries.add("Argentina"); + availableCountries.add("Armenia"); + availableCountries.add("Australia"); + availableCountries.add("Austria"); + availableCountries.add("Azerbaijan"); + availableCountries.add("Bahamas"); + availableCountries.add("Bahrain"); + availableCountries.add("Bangladesh"); + availableCountries.add("Barbados"); + availableCountries.add("Belarus"); + availableCountries.add("Belgium"); + availableCountries.add("Belize"); + availableCountries.add("Benin"); + availableCountries.add("Bhutan"); + availableCountries.add("Bolivia"); + availableCountries.add("Bosnia Herzegovina"); + availableCountries.add("Botswana"); + availableCountries.add("Brazil"); + availableCountries.add("Brunei"); + availableCountries.add("Bulgaria"); + availableCountries.add("Burkina"); + availableCountries.add("Burundi"); + availableCountries.add("Cambodia"); + availableCountries.add("Cameroon"); + availableCountries.add("Canada"); + availableCountries.add("Cape Verde"); + availableCountries.add("Central African Rep"); + availableCountries.add("Chad"); + availableCountries.add("Chile"); + availableCountries.add("China"); + availableCountries.add("Colombia"); + availableCountries.add("Comoros"); + availableCountries.add("Congo"); + availableCountries.add("Congo {Democratic Rep}"); + availableCountries.add("Costa Rica"); + availableCountries.add("Croatia"); + availableCountries.add("Cuba"); + availableCountries.add("Cyprus"); + availableCountries.add("Czech Republic"); + availableCountries.add("Denmark"); + availableCountries.add("Djibouti"); + availableCountries.add("Dominica"); + availableCountries.add("Dominican Republic"); + availableCountries.add("East Timor"); + availableCountries.add("Ecuador"); + availableCountries.add("Egypt"); + availableCountries.add("El Salvador"); + availableCountries.add("Equatorial Guinea"); + availableCountries.add("Eritrea"); + availableCountries.add("Estonia"); + availableCountries.add("Ethiopia"); + availableCountries.add("Fiji"); + availableCountries.add("Finland"); + availableCountries.add("France"); + availableCountries.add("Gabon"); + availableCountries.add("Gambia"); + availableCountries.add("Georgia"); + availableCountries.add("Germany"); + availableCountries.add("Ghana"); + availableCountries.add("Greece"); + availableCountries.add("Grenada"); + availableCountries.add("Guatemala"); + availableCountries.add("Guinea"); + availableCountries.add("Guinea-Bissau"); + availableCountries.add("Guyana"); + availableCountries.add("Haiti"); + availableCountries.add("Honduras"); + availableCountries.add("Hungary"); + availableCountries.add("Iceland"); + availableCountries.add("India"); + availableCountries.add("Indonesia"); + availableCountries.add("Iran"); + availableCountries.add("Iraq"); + availableCountries.add("Ireland {Republic}"); + availableCountries.add("Israel"); + availableCountries.add("Italy"); + availableCountries.add("Ivory Coast"); + availableCountries.add("Jamaica"); + availableCountries.add("Japan"); + availableCountries.add("Jordan"); + availableCountries.add("Kazakhstan"); + availableCountries.add("Kenya"); + availableCountries.add("Kiribati"); + availableCountries.add("Korea North"); + availableCountries.add("Korea South"); + availableCountries.add("Kosovo"); + availableCountries.add("Kuwait"); + availableCountries.add("Kyrgyzstan"); + availableCountries.add("Laos"); + availableCountries.add("Latvia"); + availableCountries.add("Lebanon"); + availableCountries.add("Lesotho"); + availableCountries.add("Liberia"); + availableCountries.add("Libya"); + availableCountries.add("Liechtenstein"); + availableCountries.add("Lithuania"); + availableCountries.add("Luxembourg"); + availableCountries.add("Macedonia"); + availableCountries.add("Madagascar"); + availableCountries.add("Malawi"); + availableCountries.add("Malaysia"); + availableCountries.add("Maldives"); + availableCountries.add("Mali"); + availableCountries.add("Malta"); + availableCountries.add("Marshall Islands"); + availableCountries.add("Mauritania"); + availableCountries.add("Mauritius"); + availableCountries.add("Mexico"); + availableCountries.add("Micronesia"); + availableCountries.add("Moldova"); + availableCountries.add("Monaco"); + availableCountries.add("Mongolia"); + availableCountries.add("Montenegro"); + availableCountries.add("Morocco"); + availableCountries.add("Mozambique"); + availableCountries.add("Myanmar, {Burma}"); + availableCountries.add("Namibia"); + availableCountries.add("Nauru"); + availableCountries.add("Nepal"); + availableCountries.add("Netherlands"); + availableCountries.add("New Zealand"); + availableCountries.add("Nicaragua"); + availableCountries.add("Niger"); + availableCountries.add("Nigeria"); + availableCountries.add("Norway"); + availableCountries.add("Oman"); + availableCountries.add("Pakistan"); + availableCountries.add("Palau"); + availableCountries.add("Panama"); + availableCountries.add("Papua New Guinea"); + availableCountries.add("Paraguay"); + availableCountries.add("Peru"); + availableCountries.add("Philippines"); + availableCountries.add("Poland"); + availableCountries.add("Portugal"); + availableCountries.add("Qatar"); + availableCountries.add("Romania"); + availableCountries.add("Russian Federation"); + availableCountries.add("Rwanda"); + availableCountries.add("St Kitts & Nevis"); + availableCountries.add("St Lucia"); + availableCountries.add("Saint Vincent & the Grenadines"); + availableCountries.add("Samoa"); + availableCountries.add("San Marino"); + availableCountries.add("Sao Tome & Principe"); + availableCountries.add("Saudi Arabia"); + availableCountries.add("Senegal"); + availableCountries.add("Serbia"); + availableCountries.add("Seychelles"); + availableCountries.add("Sierra Leone"); + availableCountries.add("Singapore"); + availableCountries.add("Slovakia"); + availableCountries.add("Slovenia"); + availableCountries.add("Solomon Islands"); + availableCountries.add("Somalia"); + availableCountries.add("South Africa"); + availableCountries.add("South Sudan"); + availableCountries.add("Spain"); + availableCountries.add("Sri Lanka"); + availableCountries.add("Sudan"); + availableCountries.add("Suriname"); + availableCountries.add("Swaziland"); + availableCountries.add("Sweden"); + availableCountries.add("Switzerland"); + availableCountries.add("Syria"); + availableCountries.add("Taiwan"); + availableCountries.add("Tajikistan"); + availableCountries.add("Tanzania"); + availableCountries.add("Thailand"); + availableCountries.add("Togo"); + availableCountries.add("Tonga"); + availableCountries.add("Trinidad & Tobago"); + availableCountries.add("Tunisia"); + availableCountries.add("Turkey"); + availableCountries.add("Turkmenistan"); + availableCountries.add("Tuvalu"); + availableCountries.add("Uganda"); + availableCountries.add("Ukraine"); + availableCountries.add("United Arab Emirates"); + availableCountries.add("United Kingdom"); + availableCountries.add("USA"); + availableCountries.add("Uruguay"); + availableCountries.add("Uzbekistan"); + availableCountries.add("Vanuatu"); + availableCountries.add("Vatican City"); + availableCountries.add("Venezuela"); + availableCountries.add("Vietnam"); + availableCountries.add("Yemen"); + availableCountries.add("Zambia"); + availableCountries.add("Zimbabwe"); + + List newMissionCountries = new ArrayList<>(); + MissionCountry missionCountry; + + for (String country : availableCountries){ + if (missionCountries != null && !containMissionCountry(missionCountries, country)) { + missionCountry = new MissionCountry(); + missionCountry.setName(country); + newMissionCountries.add(missionCountry); + } + } + + missionCountryRepository.createAll(newMissionCountries); + missionCountries = missionCountryRepository.findAll(MissionCountry.class); + + //mission teams + List missionTeams = missionTeamRepository.findAll(MissionTeam.class); + List newMissionTeams = new ArrayList<>(); + MissionTeam missionTeam; + if (missionTeams != null && !containMissionTeam(missionTeams, "Aid for Haiti")) { + missionTeam = new MissionTeam(); + missionTeam.setName("Aid for Haiti"); + missionTeam.setLocation("Tennessee"); + missionTeam.setDescription("Dr. Sutherland's group"); + newMissionTeams.add(missionTeam); + } + if (missionTeams != null && !containMissionTeam(missionTeams, "WSU-WHSO")) { + missionTeam = new MissionTeam(); + missionTeam.setName("WSU-WHSO"); + missionTeam.setLocation("Detroit"); + missionTeam.setDescription("Wayne State medical students"); + newMissionTeams.add(missionTeam); + } + if (missionTeams != null && !containMissionTeam(missionTeams, "ApParent Project")) { + missionTeam = new MissionTeam(); + missionTeam.setName("ApParent Project"); + missionTeam.setLocation("New York"); + missionTeam.setDescription("Dr. Parson's group - primarily operates in Port Au Prince"); + newMissionTeams.add(missionTeam); + } + missionTeamRepository.createAll(newMissionTeams); + + //countries + List missionCities = missionCityRepository.findAll(MissionCity.class); + List newMissionCities = new ArrayList<>(); + + MissionCity missionCity; + if (missionCities != null && !containMissionCity(missionCities, "Morne De L' Hopital", "Haiti")) { + missionCity = new MissionCity(); + missionCity.setName("Morne De L' Hopital"); + missionCity.setMissionCountry(getMissionCountry(missionCountries, "Haiti")); + newMissionCities.add(missionCity); + } + if (missionCities != null && !containMissionCity(missionCities, "Port-au-Prince", "Haiti")) { + missionCity = new MissionCity(); + missionCity.setName("Port-au-Prince"); + missionCity.setMissionCountry(getMissionCountry(missionCountries, "Haiti")); + newMissionCities.add(missionCity); + } + missionCityRepository.createAll(newMissionCities); + } private void seedPatientAgeClassification() { @@ -73,7 +474,7 @@ private void seedPatientAgeClassification() { List newPatientAgeClassifications = new ArrayList<>(); PatientAgeClassification patientAgeClassification; - if (patientAgeClassifications != null && !containClassification(patientAgeClassifications, "infant")){ + if (patientAgeClassifications != null && !containClassification(patientAgeClassifications, "infant")) { patientAgeClassification = new PatientAgeClassification(); patientAgeClassification.setName("infant"); patientAgeClassification.setDescription("0-1"); @@ -81,7 +482,7 @@ private void seedPatientAgeClassification() { patientAgeClassification.setSortOrder(1); newPatientAgeClassifications.add(patientAgeClassification); } - if (patientAgeClassifications != null && !containClassification(patientAgeClassifications, "child")){ + if (patientAgeClassifications != null && !containClassification(patientAgeClassifications, "child")) { patientAgeClassification = new PatientAgeClassification(); patientAgeClassification.setName("child"); patientAgeClassification.setDescription("2-12"); @@ -89,7 +490,7 @@ private void seedPatientAgeClassification() { patientAgeClassification.setSortOrder(2); newPatientAgeClassifications.add(patientAgeClassification); } - if (patientAgeClassifications != null && !containClassification(patientAgeClassifications, "teen")){ + if (patientAgeClassifications != null && !containClassification(patientAgeClassifications, "teen")) { patientAgeClassification = new PatientAgeClassification(); patientAgeClassification.setName("teen"); patientAgeClassification.setDescription("13-17"); @@ -97,7 +498,7 @@ private void seedPatientAgeClassification() { patientAgeClassification.setSortOrder(3); newPatientAgeClassifications.add(patientAgeClassification); } - if (patientAgeClassifications != null && !containClassification(patientAgeClassifications, "adult")){ + if (patientAgeClassifications != null && !containClassification(patientAgeClassifications, "adult")) { patientAgeClassification = new PatientAgeClassification(); patientAgeClassification.setName("adult"); patientAgeClassification.setDescription("18-64"); @@ -105,7 +506,7 @@ private void seedPatientAgeClassification() { patientAgeClassification.setSortOrder(4); newPatientAgeClassifications.add(patientAgeClassification); } - if (patientAgeClassifications != null && !containClassification(patientAgeClassifications, "elder")){ + if (patientAgeClassifications != null && !containClassification(patientAgeClassifications, "elder")) { patientAgeClassification = new PatientAgeClassification(); patientAgeClassification.setName("elder"); patientAgeClassification.setDescription("65+"); @@ -328,6 +729,51 @@ private void seedSystemSettings() { } } + private static IMissionCountry getMissionCountry(List missionCountries, String countryName) { + for (IMissionCountry mc : missionCountries) { + if (mc.getName().toLowerCase().equals(countryName.toLowerCase())) { + return mc; + } + } + return null; + } + + private static boolean containMissionCity(List missionCities, String cityName, String countryName) { + for (IMissionCity mc : missionCities) { + if (mc.getName().toLowerCase().equals(cityName.toLowerCase()) && mc.getMissionCountry().getName().toLowerCase().equals(countryName.toLowerCase())) { + return true; + } + } + return false; + } + + private static boolean containMissionTeam(List missionTeams, String name) { + for (IMissionTeam mt : missionTeams) { + if (mt.getName().equals(name)) { + return true; + } + } + return false; + } + + private static boolean containMissionCountry(List missionCountries, String name) { + for (IMissionCountry mc : missionCountries) { + if (mc.getName().equals(name)) { + return true; + } + } + return false; + } + + private static boolean containDiagnosis(List diagnosises, String name) { + for (IDiagnosis d : diagnosises) { + if (d.getName().equals(name)) { + return true; + } + } + return false; + } + private static boolean containClassification(List ageClassifications, String name) { for (IPatientAgeClassification pac : ageClassifications) { if (pac.getName().equals(name)) { @@ -610,7 +1056,7 @@ private void seedAdminUser() { userRepository.create(adminUser); //SuperUser is currently only used for managing dynamic tabs on the medical page - //SuperUser is a "backdoor" account that gives access to important configuration + //SuperUser is an account that gives access to important configuration //settings User superUser = new User(); String encryptedSuperUserPassword = encryptor.encryptPassword("wsu1f8e6m8r"); diff --git a/app/femr/util/startup/Global.java b/app/femr/util/startup/Global.java index 06be99a27..0a9fbb256 100644 --- a/app/femr/util/startup/Global.java +++ b/app/femr/util/startup/Global.java @@ -20,7 +20,6 @@ import com.google.inject.Guice; import com.google.inject.Injector; -import femr.common.dto.CurrentUser; import femr.util.dependencyinjection.modules.BusinessLayerModule; import femr.util.dependencyinjection.modules.DataLayerModule; import femr.util.dependencyinjection.modules.UtilitiesModule; @@ -29,8 +28,8 @@ import play.mvc.*; import play.mvc.Http.*; import play.libs.F.*; - import static play.mvc.Results.*; +import femr.ui.views.html.errors.global; public class Global extends GlobalSettings { @@ -38,6 +37,7 @@ public class Global extends GlobalSettings { @Override public void onStart(Application app) { + super.onStart(app); new DatabaseSeeder().seed(); } @@ -61,7 +61,7 @@ public Promise onError(RequestHeader request, Throwable t) { @Override public Promise onBadRequest(RequestHeader request, String error) { return Promise.pure(internalServerError( - femr.ui.views.html.errors.global.render() + global.render() )); } diff --git a/app/femr/util/stringhelpers/StringUtils.java b/app/femr/util/stringhelpers/StringUtils.java index e50fbf9a1..492c834ad 100644 --- a/app/femr/util/stringhelpers/StringUtils.java +++ b/app/femr/util/stringhelpers/StringUtils.java @@ -81,4 +81,15 @@ public static String ToSimpleDate(Date dt) return ""; } + public static String splitCamelCase(String s) { + return s.replaceAll( + String.format("%s|%s|%s", + "(?<=[A-Z])(?=[A-Z][a-z])", + "(?<=[^A-Z])(?=[A-Z])", + "(?<=[A-Za-z])(?=[^A-Za-z])" + ), + " " + ); + } + } diff --git a/conf/application.conf b/conf/application.conf index e92f273ef..e9a130939 100644 --- a/conf/application.conf +++ b/conf/application.conf @@ -3,7 +3,7 @@ default.admin.username="admin" default.admin.password="admin" #Session time out, in minutes -sessionTimeout=15 +sessionTimeout=50 bcrypt.workFactor=10 @@ -15,6 +15,7 @@ db.default.driver="com.mysql.jdbc.Driver" db.default.url="jdbc:mysql://localhost/femr?characterEncoding=UTF-8" db.default.user="sa" db.default.password="" +db.default.logStatements=false photos.path="./Upload/Pictures/Patients" photos.encounterPath="./Upload/Pictures/PatientEncounters" diff --git a/conf/evolutions/default/69.sql b/conf/evolutions/default/69.sql index 7a48ff1d1..5085b5688 100644 --- a/conf/evolutions/default/69.sql +++ b/conf/evolutions/default/69.sql @@ -1,10 +1,20 @@ # --- !Ups +ALTER TABLE `patient_encounters` +DROP FOREIGN KEY `fk_patient_encounter_patient_age_classification_id`; + ALTER TABLE `patient_age_classifications` CHANGE COLUMN `id` `id` INT(11) NOT NULL , ADD COLUMN `sortOrder` INT NOT NULL AUTO_INCREMENT AFTER `isDeleted`, ADD UNIQUE INDEX `sortOrder_UNIQUE` (`sortOrder` ASC); +ALTER TABLE `patient_encounters` +ADD CONSTRAINT `fk_patient_encounter_patient_age_classification_id` +FOREIGN KEY (`patient_age_classification_id`) +REFERENCES `patient_age_classifications` (`id`) + ON DELETE NO ACTION + ON UPDATE NO ACTION; + # --- !Downs ALTER TABLE `patient_age_classifications` diff --git a/conf/evolutions/default/70.sql b/conf/evolutions/default/70.sql index 798f8bc4b..38b4ad1c3 100644 --- a/conf/evolutions/default/70.sql +++ b/conf/evolutions/default/70.sql @@ -1,9 +1,19 @@ # --- !Ups +ALTER TABLE `patient_encounters` +DROP FOREIGN KEY `fk_patient_encounter_patient_age_classification_id`; + ALTER TABLE `patient_age_classifications` CHANGE COLUMN `id` `id` INT(11) NOT NULL AUTO_INCREMENT , CHANGE COLUMN `sortOrder` `sortOrder` INT(11) NOT NULL ; +ALTER TABLE `patient_encounters` +ADD CONSTRAINT `fk_patient_encounter_patient_age_classification_id` +FOREIGN KEY (`patient_age_classification_id`) +REFERENCES `patient_age_classifications` (`id`) + ON DELETE NO ACTION + ON UPDATE NO ACTION; + # --- !Downs ALTER TABLE `patient_age_classifications` diff --git a/conf/evolutions/default/71.sql b/conf/evolutions/default/71.sql index 8b37c8aef..2dfb76a97 100644 --- a/conf/evolutions/default/71.sql +++ b/conf/evolutions/default/71.sql @@ -7,10 +7,98 @@ ALTER TABLE `patient_prescriptions` CHANGE COLUMN `isCounseled` `isCounseled` BIT(1) NOT NULL DEFAULT false , ADD COLUMN `isDispensed` BIT(1) NOT NULL DEFAULT false AFTER `isCounseled`; +CREATE TABLE `mission_cities` ( + `id` INT NOT NULL AUTO_INCREMENT, + `name` VARCHAR(255) NOT NULL, + PRIMARY KEY (`id`), + UNIQUE INDEX `id_UNIQUE` (`id` ASC)); + +CREATE TABLE `mission_countries` ( + `id` INT NOT NULL AUTO_INCREMENT, + `name` VARCHAR(255) NOT NULL, + PRIMARY KEY (`id`), + UNIQUE INDEX `id_UNIQUE` (`id` ASC)); + +CREATE TABLE `mission_teams` ( + `id` INT NOT NULL AUTO_INCREMENT, + `name` VARCHAR(255) NOT NULL, + PRIMARY KEY (`id`), + UNIQUE INDEX `id_UNIQUE` (`id` ASC)); + +ALTER TABLE `mission_teams` +ADD COLUMN `location` VARCHAR(255) NULL DEFAULT NULL AFTER `name`; + +ALTER TABLE `mission_teams` +ADD COLUMN `description` VARCHAR(255) NULL DEFAULT NULL AFTER `name`; + +ALTER TABLE `mission_cities` +CHANGE COLUMN `id` `id` INT(10) NOT NULL AUTO_INCREMENT , +ADD COLUMN `mission_country_id` INT(10) NOT NULL AFTER `name`, +ADD INDEX `fk_mission_cities_1_idx` (`mission_country_id` ASC); +ALTER TABLE `mission_cities` +ADD CONSTRAINT `fk_mission_cities_1` +FOREIGN KEY (`mission_country_id`) +REFERENCES `mission_countries` (`id`) + ON DELETE NO ACTION + ON UPDATE NO ACTION; + +CREATE TABLE `mission_trips` ( + `id` INT NOT NULL AUTO_INCREMENT, + `mission_team_id` INT NOT NULL, + `mission_city_id` INT NOT NULL, + PRIMARY KEY (`id`), + UNIQUE INDEX `id_UNIQUE` (`id` ASC), + INDEX `fk_mission_trips_mission_team_idx` (`mission_team_id` ASC), + INDEX `fk_mission_trips_mission_city_idx` (`mission_city_id` ASC), + CONSTRAINT `fk_mission_trips_mission_team` + FOREIGN KEY (`mission_team_id`) + REFERENCES `mission_teams` (`id`) + ON DELETE NO ACTION + ON UPDATE NO ACTION, + CONSTRAINT `fk_mission_trips_mission_city` + FOREIGN KEY (`mission_city_id`) + REFERENCES `mission_cities` (`id`) + ON DELETE NO ACTION + ON UPDATE NO ACTION); + +ALTER TABLE `patient_encounters` +ADD COLUMN `mission_trip_id` INT(11) NULL AFTER `patient_age_classification_id`, +ADD INDEX `fk_patient_encounters_id_mission_trip_id_idx` (`mission_trip_id` ASC); + +ALTER TABLE `patient_encounters` +ADD CONSTRAINT `fk_patient_encounters_id_mission_trip_id` +FOREIGN KEY (`mission_trip_id`) +REFERENCES `mission_trips` (`id`) + ON DELETE NO ACTION + ON UPDATE NO ACTION; + +ALTER TABLE `mission_trips` +ADD COLUMN `isCurrent` BIT(1) NOT NULL DEFAULT FALSE AFTER `mission_city_id`; + +ALTER TABLE `mission_trips` +ADD COLUMN `start_date` DATE NOT NULL AFTER `isCurrent`, +ADD COLUMN `end_date` DATE NOT NULL AFTER `start_date`; + + # --- !Downs ALTER TABLE `patient_prescriptions` DROP COLUMN `isCounseled`; ALTER TABLE `patient_prescriptions` -DROP COLUMN `isDispensed`; \ No newline at end of file +DROP COLUMN `isDispensed`; + +ALTER TABLE `patient_encounters` +DROP FOREIGN KEY `fk_patient_encounters_id_mission_trip_id`; + +ALTER TABLE `patient_encounters` +DROP COLUMN `mission_trip_id`, +DROP INDEX `fk_patient_encounters_id_mission_trip_id_idx` ; + +DROP TABLE `mission_trips`; + +DROP TABLE `mission_cities`; + +DROP TABLE `mission_countries`; + +DROP TABLE `mission_teams`; diff --git a/conf/evolutions/default/72.sql b/conf/evolutions/default/72.sql new file mode 100644 index 000000000..6da8948bc --- /dev/null +++ b/conf/evolutions/default/72.sql @@ -0,0 +1,15 @@ +# --- !Ups + +CREATE TABLE `diagnoses` ( + `id` INT NOT NULL, + `name` VARCHAR(255) NOT NULL, + PRIMARY KEY (`id`)); + +ALTER TABLE `diagnoses` +CHANGE COLUMN `id` `id` INT(11) NOT NULL AUTO_INCREMENT ; + + + +# --- !Downs + +DROP TABLE `diagnoses`; \ No newline at end of file diff --git a/conf/routes b/conf/routes index 3fd2e84ef..0a9bf8e77 100644 --- a/conf/routes +++ b/conf/routes @@ -7,6 +7,9 @@ GET /superuser/tabs/:name @femr.ui.controllers.SuperuserContr POST /superuser/tabs/:name @femr.ui.controllers.SuperuserController.contentPost(name: String) GET /superuser/tabs @femr.ui.controllers.SuperuserController.tabsGet() POST /superuser/tabs @femr.ui.controllers.SuperuserController.tabsPost() +GET /superuser/trips @femr.ui.controllers.SuperuserController.tripsGet() +POST /superuser/trips @femr.ui.controllers.SuperuserController.tripsPost() +POST /superuser/trips/:id @femr.ui.controllers.SuperuserController.toggleCurrentTripPost(id: Integer) GET /superuser @femr.ui.controllers.SuperuserController.indexGet() #Admin POST /admin/users/create @femr.ui.controllers.admin.UsersController.createPost() @@ -32,6 +35,8 @@ GET /history/patient/:query @femr.ui.controllers.HistoryControl #Search GET /search/:page @femr.ui.controllers.SearchController.handleSearch(page: String) GET /search/check/:query @femr.ui.controllers.SearchController.doesPatientExist(query: String) +GET /search/typeahead/patients @femr.ui.controllers.SearchController.typeaheadPatientsJSONGet() +GET /search/typeahead/diagnoses @femr.ui.controllers.SearchController.typeaheadDiagnosisJSONGet() #Photo GET /photo/patient/:id @femr.ui.controllers.PhotoController.GetPatientPhoto(id: Integer, showDefault: Boolean) GET /photo/encounter/:id @femr.ui.controllers.PhotoController.GetPhoto(id: Int) @@ -49,12 +54,17 @@ GET /medical @femr.ui.controllers.MedicalControl POST /medical @femr.ui.controllers.MedicalController.indexPost() #Research GET /research @femr.ui.controllers.ResearchController.indexGet() +POST /research/graph @femr.ui.controllers.ResearchController.getGraphPost() +GET /research/generateData @femr.ui.controllers.ResearchController.generateData() + + #Sessions GET /logout @femr.ui.controllers.SessionsController.delete() POST /login/reset @femr.ui.controllers.SessionsController.editPasswordPost() POST /login @femr.ui.controllers.SessionsController.createPost() GET /login @femr.ui.controllers.SessionsController.createGet() +#Home GET / @femr.ui.controllers.HomeController.index() # Map static resources from the /public folder to the /assets URL path diff --git a/conf/scripts/upgrade_213.sql b/conf/scripts/upgrade_213.sql new file mode 100644 index 000000000..785c1a8a2 --- /dev/null +++ b/conf/scripts/upgrade_213.sql @@ -0,0 +1,10 @@ +-- Before upgrading to fEMR 2.1.3, run these scripts and upgrade MySQL to 5.6. +-- Seriously, goodluck reverting back. + +UPDATE `play_evolutions` +SET `apply_script`='ALTER TABLE `patient_encounters`\nDROP FOREIGN KEY `fk_patient_encounter_patient_age_classification_id`;\n\nALTER TABLE `patient_age_classifications`\nCHANGE COLUMN `id` `id` INT(11) NOT NULL ,\nADD COLUMN `sortOrder` INT NOT NULL AUTO_INCREMENT AFTER `isDeleted`,\nADD UNIQUE INDEX `sortOrder_UNIQUE` (`sortOrder` ASC);\n\nALTER TABLE `patient_encounters`\nADD CONSTRAINT `fk_patient_encounter_patient_age_classification_id`\nFOREIGN KEY (`patient_age_classification_id`)\nREFERENCES `patient_age_classifications` (`id`)\nON DELETE NO ACTION\nON UPDATE NO ACTION;' +WHERE `id`='69'; + +UPDATE `play_evolutions` +SET `apply_script`='ALTER TABLE `patient_encounters`\nDROP FOREIGN KEY `fk_patient_encounter_patient_age_classification_id`;\n\nALTER TABLE `patient_age_classifications`\nCHANGE COLUMN `id` `id` INT(11) NOT NULL AUTO_INCREMENT ,\nCHANGE COLUMN `sortOrder` `sortOrder` INT(11) NOT NULL ;\n\nALTER TABLE `patient_encounters`\nADD CONSTRAINT `fk_patient_encounter_patient_age_classification_id`\nFOREIGN KEY (`patient_age_classification_id`)\nREFERENCES `patient_age_classifications` (`id`)\nON DELETE NO ACTION\nON UPDATE NO ACTION;' +WHERE `id`='70'; \ No newline at end of file diff --git a/conf/test.conf b/conf/test.conf new file mode 100644 index 000000000..d4b41ed3b --- /dev/null +++ b/conf/test.conf @@ -0,0 +1,7 @@ +include "application.conf" + +db.default.user="femr" +db.default.password="PnhcTUQ9xpraJf7e" + +#Session time out, in minutes +sessionTimeout=2880 \ No newline at end of file diff --git a/project/Build.scala b/project/Build.scala index f0756dfee..e9e41e649 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -5,7 +5,7 @@ import play.Play.autoImport._ object ApplicationBuild extends Build { val appName = "fEMR" - val appVersion = "2.1.2"//doesn't auto update everything in the code when this is changed + val appVersion = "2.1.3" val currentScalaVersion = "2.11.2" val appDependencies = Seq( @@ -14,16 +14,16 @@ object ApplicationBuild extends Build { javaJdbc, javaEbean, "com.google.inject" % "guice" % "3.0", - "mysql" % "mysql-connector-java" % "5.1.18", + "mysql" % "mysql-connector-java" % "5.1.34", "org.mindrot" % "jbcrypt" % "0.3m", "commons-collections" % "commons-collections" % "3.2.1", - "com.google.code.gson" % "gson" % "2.2.4" + "com.google.code.gson" % "gson" % "2.3.1" ) val main = Project(appName, file(".")).enablePlugins(play.PlayJava).settings( - /*javacOptions += "-Xlint:deprecation",*/ //use when searching for deprecated API usage - /*javacOptions += "-Xlint:unchecked",*/ //use when you want to display java warnings + javacOptions += "-Xlint:deprecation", //*/ //use when searching for deprecated API usage + javacOptions += "-Xlint:unchecked", //*/ //use when you want to display java warnings version := appVersion, scalaVersion := currentScalaVersion, libraryDependencies ++= appDependencies, diff --git a/project/plugins.sbt b/project/plugins.sbt index 08bb0a6db..b813154d7 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -7,4 +7,4 @@ resolvers += "Typesafe repository" at "http://repo.typesafe.com/typesafe/release resolvers += "jBCrypt Repository" at "http://repo1.maven.org/maven2/org/" // Use the Play sbt plugin for Play projects -addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.3.4") +addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.3.7") diff --git a/public/css/admin/users.css b/public/css/admin/users.css index fa0094364..5478e55d7 100644 --- a/public/css/admin/users.css +++ b/public/css/admin/users.css @@ -33,9 +33,6 @@ color: #577A3A; font-weight: bold; } -.errors{ - color: rgb(198, 0, 0); -} .fieldWrap{ margin-bottom: 15px; } diff --git a/public/css/femr.css b/public/css/femr.css index 7fc52822c..3539ba6fe 100644 --- a/public/css/femr.css +++ b/public/css/femr.css @@ -471,4 +471,191 @@ The hamburger button height: 2px; margin-top: 3px; width: 100%; +} + + + +/* Generic Typeahead Styles */ + +input[style] { + vertical-align: middle !important; +} + +.twitter-typeahead{ + + width: 100%; +} + +.twitter-typeahead input[type="text"]{ + + background-color: #fff !important; +} + +.twitter-typeahead .tt-hint { + height: 44px; + padding: 6px 9px; + font-size: 14px; + display: none; +} + +.twitter-typeahead .hint-small { + height: 30px; + padding: 5px 10px; + font-size: 12px; + border-radius: 3px; + line-height: 1.5; +} + +.twitter-typeahead .hint-large { + height: 45px; + padding: 10px 16px; + font-size: 18px; + border-radius: 6px; + line-height: 1.33; +} + +.twitter-typeahead .tt-query, +.twitter-typeahead .tt-hint { + margin-bottom: 0; +} + +.tt-dropdown-menu { + font-size: 16px; + min-width: 160px; + margin-top: 2px; + padding: 5px 0; + background-color: #fff; + *border-right-width: 2px; + *border-bottom-width: 2px; + -webkit-border-radius: 6px; + -moz-border-radius: 6px; + border-radius: 6px; + -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, .2); + -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, .2); + box-shadow: 0 5px 10px rgba(0, 0, 0, .2); + -webkit-background-clip: padding-box; + background-clip: padding-box; + position: relative !important; + + max-height: 200px; + overflow-y: auto; +} + +.tt-suggestion { + display: block; + padding: 0; + color: #2f2f2f; +} + +.tt-suggestion.tt-cursor { + color: #fff; + background-color: #cfcfcf; +} + +.tt-suggestion.tt-cursor a { + color: #fff; +} + +.tt-suggestion p { + margin: 0; +} + +.tt-highlight{ + + background-color: yellow; +} + +/*errors from viewmodel form validation*/ +.errors, .error dd{ + color: rgb(198, 0, 0); +} + + +/* Custom Typeahead Styles */ + +#patientSearchContainer{ + + width: 100%; + position: relative; + text-align: left; +} + +#patientSearchContainer span{ + + width: 100%; +} + +#patientSearchContainer input.patientSearch{ + + width: 100%; + height: 44px; + line-height: 44px; + margin-top: 10px; +} + +#patientSearchContainer .patientResult{ + + overflow: hidden; + border-bottom: 1px solid #9f9f9f; + position: relative; + display: block; + height: 96px; + color: #2f2f2f; +} + +#patientSearchContainer .patientResult span{ + + color: #2f2f2f; +} + +#patientSearchContainer .patientResult:hover span, +#patientSearchContainer .patientResult.tt-cursor span{ + + color: #000000; +} + + + +#patientSearchContainer .patientResult a{ + + display: block; + text-decoration: none; + /* right padding for image */ + padding: 8px 96px 8px 8px; + + position: absolute; + top: 0; + left: 0; + height: 100%; + width: 100%; +} + +#patientSearchContainer .patientResult .name{ + + display: block; + clear: both; + font-size: 1.1em; +} + +#patientSearchContainer .patientResult .age{ + + display: block; + clear: both; + margin-top: 3px; + margin-left: 10px; + font-size: 0.9em; +} + +#patientSearchContainer .patientResult .photo{ + + position: absolute; + right: 8px; + top: 8px; + width: 80px; + height: 80px; +} + +#patientSearchContainer .emptyMessage{ + + text-align: center; } \ No newline at end of file diff --git a/public/css/pharmacy.css b/public/css/pharmacy.css index a61f474d5..01a8ab53a 100644 --- a/public/css/pharmacy.css +++ b/public/css/pharmacy.css @@ -182,4 +182,8 @@ input[style] { #submitWrap { width: 100%; float: right; +} + +#prescriber{ + font-size: 10px; } \ No newline at end of file diff --git a/public/css/research.css b/public/css/research.css index e69de29bb..0072fa9cf 100644 --- a/public/css/research.css +++ b/public/css/research.css @@ -0,0 +1,641 @@ +/* + * Sidebar + */ + +/* Hide for mobile, show later */ +.sidebar { + display: none; +} + +@media (min-width: 768px) { + + .sidebar { + position: fixed; + top: 50px; + bottom: 0; + left: 0; + z-index: 1000; + display: block; + padding: 20px; + background-color: #000; + border-right: 1px solid #6f6f6f; + } +} + +/* Sidebar navigation */ +.nav-sidebar { + margin-right: -20px; + margin-bottom: 20px; + margin-left: -20px; + border-top: 1px solid #6f6f6f; +} +.nav-sidebar li.menu-item { + position: relative; + border-bottom: 1px solid #6f6f6f; +} +.nav-sidebar li.controls{ + + border: none; + padding: 10px; + color: #eeeeee; + border-bottom: 1px solid #6f6f6f; +} + +.nav-sidebar li.controls label{ + + font-weight: normal; + color: #cccccc; +} + +.nav-sidebar li.controls span.group{ + + display: block; + white-space: nowrap; + padding: 0; +} + +.nav-sidebar li.controls span.group input[type="checkbox"]{ + + margin-right: 8px; +} + +.nav-sidebar li.controls span.group input[type="text"]{ + + display: inline; + width: 30px; + text-align: center; + margin-left: 2px; +} + +.nav-sidebar li.controls span.filter{ + + display: block; + white-space: nowrap; + margin-bottom: 10px; +} + +.nav-sidebar li.controls span.filter .glyphicon-remove { + + cursor: pointer; + color: #BB1D1D; +} + +.nav-sidebar li.controls span.filter label{ + + display: block; + width: 100%; +} + +.nav-sidebar li.controls span.filter input[type="text"]{ + + width: 50px; +} + +.nav-sidebar li.controls span.filter input#rangeStart{ + + margin-left: 5px; +} + +.nav-sidebar li.controls span.medication{ + + display: block; + white-space: nowrap; + margin-bottom: 15px; +} + +.nav-sidebar li.controls span.medication select{ + + display: block; + clear: both; + margin-left: 10px; + width: 150px; +} + +.nav-sidebar li.submit{ + + padding: 20px 10px +} + +.nav-sidebar li.submit input.clear{ + + background-color: #ccc; + color: #333; + padding: 3px 8px; + font-size: 1.1em; +} +.nav-sidebar li.submit input.clear:hover { + + background-color: #9f9f9f; +} +.nav-sidebar li.submit input.submit{ + + background-color: rgb(44, 158, 255); + color: #ffffff; + padding: 3px 8px; + font-size: 1.1em; +} + +.nav-sidebar li.submit input.submit:hover{ + + background-color: rgb(17, 106, 181); +} +.nav-sidebar li.menu-item .val{ + + position: absolute; + bottom: 0.3em; + left: 10px; + color: #7f7f7f; + display: block; + font-size: .9em; +} + +.nav-sidebar li.menu-item .glyphicon{ + + position: absolute; + top: 50%; + right: 8px; + color: #6f6f6f; + font-size: 14px; + line-height: 20px; + margin-top: -10px; +} + +.nav-sidebar li.menu-item > a { + + padding: 0.5em 10px 1.6em; + color: #ccc; +} +.nav-sidebar li.menu-item > a.noval{ + + padding-bottom: 0.5em; +} + + +.nav-sidebar li.menu-item > a:hover{ + + cursor: pointer; + background-color: #000; + color: #ccc; +} + + +.nav-sidebar > li.active > a, +.nav-sidebar > li.active > a:hover, +.nav-sidebar > li.active > a:focus{ + + background-color: #333333; + color: #fff; + cursor: pointer; +} +.nav-sidebar li.menu-item span:hover{ + cursor: pointer; +} +.nav-sidebar .submenu{ + + background-color: black; + position: absolute; + left: 100%; + top: 0; + display: none; + padding: 0; + margin: 0 0 0 1px; + min-width: 160px; + list-style: none; +} + +.nav-sidebar .submenu.active{ + + display: block; +} +.nav-sidebar .submenu li{ + + color: #ffffff; +} +.nav-sidebar .submenu li a{ + + display: block; + white-space: nowrap; + padding: 3px 20px; + color: #cfcfcf; +} +.nav-sidebar .submenu li a:hover { + + text-decoration: none; + background-color: #333333; + color: #fff; + cursor: pointer; +} +.nav-sidebar .submenu li a.disabled { + + color: #333333; +} +.nav-sidebar .submenu li a.disabled:hover{ + + background-color: transparent; + color: #333333; +} +.nav-sidebar .submenu li a.clear{ + + border-top: 1px solid #4f4f4f; + border-bottom: 1px solid #4f4f4f; + position: relative; + color: #ffffff; +} +.nav-sidebar .submenu li a.clear .glyphicon{ + + position: relative;; + float: left; + top: auto; + right: auto; + margin: -1px 5px 0 0; + color: #BB1D1D; +} +.nav-sidebar .submenu li.title{ + + background-color: #1f1f1f; + border-top: 1px solid #4f4f4f; + border-bottom: 1px solid #4f4f4f; + padding: 5px 10px; +} + +/* +.nav-sidebar .submenu li #save{ + + background-color: #1f1f1f; + border-top: 1px solid #4f4f4f; + border-bottom: 1px solid #4f4f4f; + padding: 5px 10px; +} +*/ + +#gfilter-menu .submenu{ + + padding-bottom: 10px; +} + +#gfilter-menu .submenu li{ + + padding: 10px 30px; +} + +#filter-errors{ + + margin-right: -10px; + margin-bottom: 10px; + margin-left: -10px; + +} + +#filter-errors ul{ + + margin: 0; + padding: 0; + list-style: none; +} + +#filter-errors ul li { + + list-style: none; + font-size: 0.9em; + color: #BB1D1D; +} + +/* + * Main content + */ + +.main { + padding: 20px 10px; +} + +.main .page-header { + margin-top: 0; +} + +/* Table Styles */ + +#table-container{ + + +} + +.table{ + + width: auto; +} + +.table td{ + + background-color: #fff; + border-right: 1px solid #dddddd; +} + +.table th{ + + background-color: #ccc; + color: #000; +} + + +.legend-bg{ + + background-color: #efefef; +} + +.chart-container{ + + background-color: #fff; + box-shadow: 1px 2px 8px #333; + position: relative; +} + +.chart-container .loading{ + + display: none; + position: absolute; + top: 50%; + left: 50%; + margin-left: -16px; + margin-top: -16px; +} + +.save-image-cont{ + + float: right; + margin-right: 1em; +} + +.save-image-cont .options{ + + display: none; + position: absolute; + top: 50%; + left: 50%; + + margin-left: -200px; + margin-top: -60px; + + width: 400px; + height: 120px; + background: #6f6f6f; + border: 1px solid #9f9f9f; + padding: 10px; + box-shadow: 1px 1px 5px #333333; +} + +.save-image-cont .options .close{ + + position: absolute; + top: 0px; + right: 5px; + opacity: 1; +} + +.save-image-cont .options .close span{ + + font-size: 12px; + color: #BB1D1D; + cursor: pointer; +} + +.save-image-cont .options p{ + + color: #ffffff; + font-size: 1.2em; + margin-bottom: 18px; +} + +.save-image-cont .options a.image-size-selection{ + + color: #000000; + background-color: #efefef; + display: block; + float: left; + margin-left: 20px; + border-radius: 4px; + border: 1px solid #9f9f9f; + padding: 5px 12px; + text-align: center; +} + +.save-image-cont .options a.image-size-selection:hover{ + + text-decoration: none; +} + + + +/* Graph Styles */ + +.graph-instructions{ + + padding: 1em; +} + +.graph-area{ + + display: none; +} + +#legend{ + + width: 200px; + height: 300px; + overflow: auto; + display: none; +} + +.graph-header{ + + padding: 1em; + background-color: #fff; + margin-bottom: 1em; + overflow: hidden; +} + +.graph-header .stat{ + + font-size: 1.1em; + margin: 0 0 5px 0; + display: none; +} + +.chart{ + + font-family: "Helvetica Neue", Arial, Helvetica, sans-serif; + background-color: #ffffff; + width: 100%; +} + +.d3-tip { + line-height: 1; + font-weight: bold; + padding: 12px; + background: rgba(0, 0, 0, 0.8); + color: #eeeeee; + border-radius: 2px; +} + +.d3-tip span{ + + color: #ffffff; +} + +.d3-tip span.name{ + + display: block; + text-align: center; + margin-bottom: 8px; + font-size: 1.2em; +} + +.d3-tip span.val{ + + display: block; + +} + +/* Creates a small triangle extender for the tooltip */ +.d3-tip:after { + box-sizing: border-box; + display: inline; + font-size: 10px; + width: 100%; + line-height: 1; + color: rgba(0, 0, 0, 0.8); + content: "\25BC"; + position: absolute; + text-align: center; +} + +/* Style northward tooltips differently */ +.d3-tip.n:after { + margin: -1px 0 0 0; + top: 100%; + left: 0; +} + + + +*[data-labelbg=true] {filter:url(#bg-color)} + +.label-text { + alignment-baseline: middle; + font-size: 14px; + fill: #ffffff; + font-weight: 300; + padding: 5px; +} +.label-line { + stroke-width: 1; + stroke: #4f4f4f; +} +.label-circle { + fill: #4f4f4f; +} + +.label_group .label{ + + display: none; +} + +.legend .item{ + + cursor: pointer; +} + +.legend text { + + font-size: 12px; + font-weight: bold; + shape-rendering: crispEdges; +} + +/* Bar Chart */ + +.bar { + fill: #4682B4; +} + +.bar:hover { + fill: #386284; +} + +/* Line Chart */ + +.line { + fill: none; + stroke: #4682B4; + stroke-width: 1.5px; +} + +.overlay { + fill: none; + pointer-events: all; +} + +.focus { + fill: #ffffff; +} + +.focus circle { + fill: red; + stroke: #3f3f3f; +} + +.focus text{ + + font-size: 16px; + fill: #2f2f2f; +} + +/* Scatter Plot */ + +.dot { + fill: #4682B4; + stroke: #3f3f3f; + cursor: pointer; +} + +.dot:hover{ + + fill: red; +} + +/* Axis */ + +.axis text { + font-size: 10px; +} + +@media (min-width: 992px){ + + .axis text { + font-size: 12px; + } +} + + + +.axis path, +.axis line { + fill: none; + stroke: #000; + shape-rendering: crispEdges; +} + +.axis text.title{ + + font-size: 14px; + font-weight: bold; + shape-rendering: crispEdges; +} + +#svgdataurl{ display: none; } +#pngdataurl{ display: none; } + + +footer p{ + + text-align: right; +} \ No newline at end of file diff --git a/public/css/superuser.css b/public/css/superuser.css index 7190d523a..8f7f68226 100644 --- a/public/css/superuser.css +++ b/public/css/superuser.css @@ -33,6 +33,29 @@ table th,td{ .halfPageTables{ width: 100%; } +} +/*trip tracking*/ +#addTeamWrap{ + width: 50%; + float: left; +} +#addTeamWrap div{ + width: 100%; + float: left; +} +#addTripWrap{ + width: 50%; + float: left; +} +#currentWrap{ + width: 100%; + float: left; + margin-top: 40px; +} +#submitWrap{ + margin-top: 40px; + float: left; + width: 100%; } \ No newline at end of file diff --git a/public/img/graph-loader.gif b/public/img/graph-loader.gif new file mode 100644 index 000000000..3c2f7c058 Binary files /dev/null and b/public/img/graph-loader.gif differ diff --git a/public/js/admin/users.js b/public/js/admin/users.js index 055e92f3b..b801d62e5 100644 --- a/public/js/admin/users.js +++ b/public/js/admin/users.js @@ -25,7 +25,7 @@ var manageUsers = { }, toggleUser: function (btn) { //user ID - var id = $(btn).attr('data-user_id'); + var id = $(btn).attr('data-id'); $.ajax({ url: '/admin/users/toggle/' + id, diff --git a/public/js/libraries/handlebars.js b/public/js/libraries/handlebars.js new file mode 100644 index 000000000..f826bbfd3 --- /dev/null +++ b/public/js/libraries/handlebars.js @@ -0,0 +1,3079 @@ +/*! + + handlebars v2.0.0 + +Copyright (C) 2011-2014 by Yehuda Katz + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. + +@license +*/ +/* exported Handlebars */ +(function (root, factory) { + if (typeof define === 'function' && define.amd) { + define([], factory); + } else if (typeof exports === 'object') { + module.exports = factory(); + } else { + root.Handlebars = root.Handlebars || factory(); + } +}(this, function () { +// handlebars/safe-string.js +var __module4__ = (function() { + "use strict"; + var __exports__; + // Build out our basic SafeString type + function SafeString(string) { + this.string = string; + } + + SafeString.prototype.toString = function() { + return "" + this.string; + }; + + __exports__ = SafeString; + return __exports__; +})(); + +// handlebars/utils.js +var __module3__ = (function(__dependency1__) { + "use strict"; + var __exports__ = {}; + /*jshint -W004 */ + var SafeString = __dependency1__; + + var escape = { + "&": "&", + "<": "<", + ">": ">", + '"': """, + "'": "'", + "`": "`" + }; + + var badChars = /[&<>"'`]/g; + var possible = /[&<>"'`]/; + + function escapeChar(chr) { + return escape[chr]; + } + + function extend(obj /* , ...source */) { + for (var i = 1; i < arguments.length; i++) { + for (var key in arguments[i]) { + if (Object.prototype.hasOwnProperty.call(arguments[i], key)) { + obj[key] = arguments[i][key]; + } + } + } + + return obj; + } + + __exports__.extend = extend;var toString = Object.prototype.toString; + __exports__.toString = toString; + // Sourced from lodash + // https://github.com/bestiejs/lodash/blob/master/LICENSE.txt + var isFunction = function(value) { + return typeof value === 'function'; + }; + // fallback for older versions of Chrome and Safari + /* istanbul ignore next */ + if (isFunction(/x/)) { + isFunction = function(value) { + return typeof value === 'function' && toString.call(value) === '[object Function]'; + }; + } + var isFunction; + __exports__.isFunction = isFunction; + /* istanbul ignore next */ + var isArray = Array.isArray || function(value) { + return (value && typeof value === 'object') ? toString.call(value) === '[object Array]' : false; + }; + __exports__.isArray = isArray; + + function escapeExpression(string) { + // don't escape SafeStrings, since they're already safe + if (string instanceof SafeString) { + return string.toString(); + } else if (string == null) { + return ""; + } else if (!string) { + return string + ''; + } + + // Force a string conversion as this will be done by the append regardless and + // the regex test will do this transparently behind the scenes, causing issues if + // an object's to string has escaped characters in it. + string = "" + string; + + if(!possible.test(string)) { return string; } + return string.replace(badChars, escapeChar); + } + + __exports__.escapeExpression = escapeExpression;function isEmpty(value) { + if (!value && value !== 0) { + return true; + } else if (isArray(value) && value.length === 0) { + return true; + } else { + return false; + } + } + + __exports__.isEmpty = isEmpty;function appendContextPath(contextPath, id) { + return (contextPath ? contextPath + '.' : '') + id; + } + + __exports__.appendContextPath = appendContextPath; + return __exports__; +})(__module4__); + +// handlebars/exception.js +var __module5__ = (function() { + "use strict"; + var __exports__; + + var errorProps = ['description', 'fileName', 'lineNumber', 'message', 'name', 'number', 'stack']; + + function Exception(message, node) { + var line; + if (node && node.firstLine) { + line = node.firstLine; + + message += ' - ' + line + ':' + node.firstColumn; + } + + var tmp = Error.prototype.constructor.call(this, message); + + // Unfortunately errors are not enumerable in Chrome (at least), so `for prop in tmp` doesn't work. + for (var idx = 0; idx < errorProps.length; idx++) { + this[errorProps[idx]] = tmp[errorProps[idx]]; + } + + if (line) { + this.lineNumber = line; + this.column = node.firstColumn; + } + } + + Exception.prototype = new Error(); + + __exports__ = Exception; + return __exports__; +})(); + +// handlebars/base.js +var __module2__ = (function(__dependency1__, __dependency2__) { + "use strict"; + var __exports__ = {}; + var Utils = __dependency1__; + var Exception = __dependency2__; + + var VERSION = "2.0.0"; + __exports__.VERSION = VERSION;var COMPILER_REVISION = 6; + __exports__.COMPILER_REVISION = COMPILER_REVISION; + var REVISION_CHANGES = { + 1: '<= 1.0.rc.2', // 1.0.rc.2 is actually rev2 but doesn't report it + 2: '== 1.0.0-rc.3', + 3: '== 1.0.0-rc.4', + 4: '== 1.x.x', + 5: '== 2.0.0-alpha.x', + 6: '>= 2.0.0-beta.1' + }; + __exports__.REVISION_CHANGES = REVISION_CHANGES; + var isArray = Utils.isArray, + isFunction = Utils.isFunction, + toString = Utils.toString, + objectType = '[object Object]'; + + function HandlebarsEnvironment(helpers, partials) { + this.helpers = helpers || {}; + this.partials = partials || {}; + + registerDefaultHelpers(this); + } + + __exports__.HandlebarsEnvironment = HandlebarsEnvironment;HandlebarsEnvironment.prototype = { + constructor: HandlebarsEnvironment, + + logger: logger, + log: log, + + registerHelper: function(name, fn) { + if (toString.call(name) === objectType) { + if (fn) { throw new Exception('Arg not supported with multiple helpers'); } + Utils.extend(this.helpers, name); + } else { + this.helpers[name] = fn; + } + }, + unregisterHelper: function(name) { + delete this.helpers[name]; + }, + + registerPartial: function(name, partial) { + if (toString.call(name) === objectType) { + Utils.extend(this.partials, name); + } else { + this.partials[name] = partial; + } + }, + unregisterPartial: function(name) { + delete this.partials[name]; + } + }; + + function registerDefaultHelpers(instance) { + instance.registerHelper('helperMissing', function(/* [args, ]options */) { + if(arguments.length === 1) { + // A missing field in a {{foo}} constuct. + return undefined; + } else { + // Someone is actually trying to call something, blow up. + throw new Exception("Missing helper: '" + arguments[arguments.length-1].name + "'"); + } + }); + + instance.registerHelper('blockHelperMissing', function(context, options) { + var inverse = options.inverse, + fn = options.fn; + + if(context === true) { + return fn(this); + } else if(context === false || context == null) { + return inverse(this); + } else if (isArray(context)) { + if(context.length > 0) { + if (options.ids) { + options.ids = [options.name]; + } + + return instance.helpers.each(context, options); + } else { + return inverse(this); + } + } else { + if (options.data && options.ids) { + var data = createFrame(options.data); + data.contextPath = Utils.appendContextPath(options.data.contextPath, options.name); + options = {data: data}; + } + + return fn(context, options); + } + }); + + instance.registerHelper('each', function(context, options) { + if (!options) { + throw new Exception('Must pass iterator to #each'); + } + + var fn = options.fn, inverse = options.inverse; + var i = 0, ret = "", data; + + var contextPath; + if (options.data && options.ids) { + contextPath = Utils.appendContextPath(options.data.contextPath, options.ids[0]) + '.'; + } + + if (isFunction(context)) { context = context.call(this); } + + if (options.data) { + data = createFrame(options.data); + } + + if(context && typeof context === 'object') { + if (isArray(context)) { + for(var j = context.length; i 0) { + throw new Exception("Invalid path: " + original, this); + } else if (part === "..") { + depth++; + depthString += '../'; + } else { + this.isScoped = true; + } + } else { + dig.push(part); + } + } + + this.original = original; + this.parts = dig; + this.string = dig.join('.'); + this.depth = depth; + this.idName = depthString + this.string; + + // an ID is simple if it only has one part, and that part is not + // `..` or `this`. + this.isSimple = parts.length === 1 && !this.isScoped && depth === 0; + + this.stringModeValue = this.string; + }, + + PartialNameNode: function(name, locInfo) { + LocationInfo.call(this, locInfo); + this.type = "PARTIAL_NAME"; + this.name = name.original; + }, + + DataNode: function(id, locInfo) { + LocationInfo.call(this, locInfo); + this.type = "DATA"; + this.id = id; + this.stringModeValue = id.stringModeValue; + this.idName = '@' + id.stringModeValue; + }, + + StringNode: function(string, locInfo) { + LocationInfo.call(this, locInfo); + this.type = "STRING"; + this.original = + this.string = + this.stringModeValue = string; + }, + + NumberNode: function(number, locInfo) { + LocationInfo.call(this, locInfo); + this.type = "NUMBER"; + this.original = + this.number = number; + this.stringModeValue = Number(number); + }, + + BooleanNode: function(bool, locInfo) { + LocationInfo.call(this, locInfo); + this.type = "BOOLEAN"; + this.bool = bool; + this.stringModeValue = bool === "true"; + }, + + CommentNode: function(comment, locInfo) { + LocationInfo.call(this, locInfo); + this.type = "comment"; + this.comment = comment; + + this.strip = { + inlineStandalone: true + }; + } + }; + + + // Must be exported as an object rather than the root of the module as the jison lexer + // most modify the object to operate properly. + __exports__ = AST; + return __exports__; +})(__module5__); + +// handlebars/compiler/parser.js +var __module9__ = (function() { + "use strict"; + var __exports__; + /* jshint ignore:start */ + /* istanbul ignore next */ + /* Jison generated parser */ + var handlebars = (function(){ + var parser = {trace: function trace() { }, + yy: {}, + symbols_: {"error":2,"root":3,"program":4,"EOF":5,"program_repetition0":6,"statement":7,"mustache":8,"block":9,"rawBlock":10,"partial":11,"CONTENT":12,"COMMENT":13,"openRawBlock":14,"END_RAW_BLOCK":15,"OPEN_RAW_BLOCK":16,"sexpr":17,"CLOSE_RAW_BLOCK":18,"openBlock":19,"block_option0":20,"closeBlock":21,"openInverse":22,"block_option1":23,"OPEN_BLOCK":24,"CLOSE":25,"OPEN_INVERSE":26,"inverseAndProgram":27,"INVERSE":28,"OPEN_ENDBLOCK":29,"path":30,"OPEN":31,"OPEN_UNESCAPED":32,"CLOSE_UNESCAPED":33,"OPEN_PARTIAL":34,"partialName":35,"param":36,"partial_option0":37,"partial_option1":38,"sexpr_repetition0":39,"sexpr_option0":40,"dataName":41,"STRING":42,"NUMBER":43,"BOOLEAN":44,"OPEN_SEXPR":45,"CLOSE_SEXPR":46,"hash":47,"hash_repetition_plus0":48,"hashSegment":49,"ID":50,"EQUALS":51,"DATA":52,"pathSegments":53,"SEP":54,"$accept":0,"$end":1}, + terminals_: {2:"error",5:"EOF",12:"CONTENT",13:"COMMENT",15:"END_RAW_BLOCK",16:"OPEN_RAW_BLOCK",18:"CLOSE_RAW_BLOCK",24:"OPEN_BLOCK",25:"CLOSE",26:"OPEN_INVERSE",28:"INVERSE",29:"OPEN_ENDBLOCK",31:"OPEN",32:"OPEN_UNESCAPED",33:"CLOSE_UNESCAPED",34:"OPEN_PARTIAL",42:"STRING",43:"NUMBER",44:"BOOLEAN",45:"OPEN_SEXPR",46:"CLOSE_SEXPR",50:"ID",51:"EQUALS",52:"DATA",54:"SEP"}, + productions_: [0,[3,2],[4,1],[7,1],[7,1],[7,1],[7,1],[7,1],[7,1],[10,3],[14,3],[9,4],[9,4],[19,3],[22,3],[27,2],[21,3],[8,3],[8,3],[11,5],[11,4],[17,3],[17,1],[36,1],[36,1],[36,1],[36,1],[36,1],[36,3],[47,1],[49,3],[35,1],[35,1],[35,1],[41,2],[30,1],[53,3],[53,1],[6,0],[6,2],[20,0],[20,1],[23,0],[23,1],[37,0],[37,1],[38,0],[38,1],[39,0],[39,2],[40,0],[40,1],[48,1],[48,2]], + performAction: function anonymous(yytext,yyleng,yylineno,yy,yystate,$$,_$) { + + var $0 = $$.length - 1; + switch (yystate) { + case 1: yy.prepareProgram($$[$0-1].statements, true); return $$[$0-1]; + break; + case 2:this.$ = new yy.ProgramNode(yy.prepareProgram($$[$0]), {}, this._$); + break; + case 3:this.$ = $$[$0]; + break; + case 4:this.$ = $$[$0]; + break; + case 5:this.$ = $$[$0]; + break; + case 6:this.$ = $$[$0]; + break; + case 7:this.$ = new yy.ContentNode($$[$0], this._$); + break; + case 8:this.$ = new yy.CommentNode($$[$0], this._$); + break; + case 9:this.$ = new yy.RawBlockNode($$[$0-2], $$[$0-1], $$[$0], this._$); + break; + case 10:this.$ = new yy.MustacheNode($$[$0-1], null, '', '', this._$); + break; + case 11:this.$ = yy.prepareBlock($$[$0-3], $$[$0-2], $$[$0-1], $$[$0], false, this._$); + break; + case 12:this.$ = yy.prepareBlock($$[$0-3], $$[$0-2], $$[$0-1], $$[$0], true, this._$); + break; + case 13:this.$ = new yy.MustacheNode($$[$0-1], null, $$[$0-2], yy.stripFlags($$[$0-2], $$[$0]), this._$); + break; + case 14:this.$ = new yy.MustacheNode($$[$0-1], null, $$[$0-2], yy.stripFlags($$[$0-2], $$[$0]), this._$); + break; + case 15:this.$ = { strip: yy.stripFlags($$[$0-1], $$[$0-1]), program: $$[$0] }; + break; + case 16:this.$ = {path: $$[$0-1], strip: yy.stripFlags($$[$0-2], $$[$0])}; + break; + case 17:this.$ = new yy.MustacheNode($$[$0-1], null, $$[$0-2], yy.stripFlags($$[$0-2], $$[$0]), this._$); + break; + case 18:this.$ = new yy.MustacheNode($$[$0-1], null, $$[$0-2], yy.stripFlags($$[$0-2], $$[$0]), this._$); + break; + case 19:this.$ = new yy.PartialNode($$[$0-3], $$[$0-2], $$[$0-1], yy.stripFlags($$[$0-4], $$[$0]), this._$); + break; + case 20:this.$ = new yy.PartialNode($$[$0-2], undefined, $$[$0-1], yy.stripFlags($$[$0-3], $$[$0]), this._$); + break; + case 21:this.$ = new yy.SexprNode([$$[$0-2]].concat($$[$0-1]), $$[$0], this._$); + break; + case 22:this.$ = new yy.SexprNode([$$[$0]], null, this._$); + break; + case 23:this.$ = $$[$0]; + break; + case 24:this.$ = new yy.StringNode($$[$0], this._$); + break; + case 25:this.$ = new yy.NumberNode($$[$0], this._$); + break; + case 26:this.$ = new yy.BooleanNode($$[$0], this._$); + break; + case 27:this.$ = $$[$0]; + break; + case 28:$$[$0-1].isHelper = true; this.$ = $$[$0-1]; + break; + case 29:this.$ = new yy.HashNode($$[$0], this._$); + break; + case 30:this.$ = [$$[$0-2], $$[$0]]; + break; + case 31:this.$ = new yy.PartialNameNode($$[$0], this._$); + break; + case 32:this.$ = new yy.PartialNameNode(new yy.StringNode($$[$0], this._$), this._$); + break; + case 33:this.$ = new yy.PartialNameNode(new yy.NumberNode($$[$0], this._$)); + break; + case 34:this.$ = new yy.DataNode($$[$0], this._$); + break; + case 35:this.$ = new yy.IdNode($$[$0], this._$); + break; + case 36: $$[$0-2].push({part: $$[$0], separator: $$[$0-1]}); this.$ = $$[$0-2]; + break; + case 37:this.$ = [{part: $$[$0]}]; + break; + case 38:this.$ = []; + break; + case 39:$$[$0-1].push($$[$0]); + break; + case 48:this.$ = []; + break; + case 49:$$[$0-1].push($$[$0]); + break; + case 52:this.$ = [$$[$0]]; + break; + case 53:$$[$0-1].push($$[$0]); + break; + } + }, + table: [{3:1,4:2,5:[2,38],6:3,12:[2,38],13:[2,38],16:[2,38],24:[2,38],26:[2,38],31:[2,38],32:[2,38],34:[2,38]},{1:[3]},{5:[1,4]},{5:[2,2],7:5,8:6,9:7,10:8,11:9,12:[1,10],13:[1,11],14:16,16:[1,20],19:14,22:15,24:[1,18],26:[1,19],28:[2,2],29:[2,2],31:[1,12],32:[1,13],34:[1,17]},{1:[2,1]},{5:[2,39],12:[2,39],13:[2,39],16:[2,39],24:[2,39],26:[2,39],28:[2,39],29:[2,39],31:[2,39],32:[2,39],34:[2,39]},{5:[2,3],12:[2,3],13:[2,3],16:[2,3],24:[2,3],26:[2,3],28:[2,3],29:[2,3],31:[2,3],32:[2,3],34:[2,3]},{5:[2,4],12:[2,4],13:[2,4],16:[2,4],24:[2,4],26:[2,4],28:[2,4],29:[2,4],31:[2,4],32:[2,4],34:[2,4]},{5:[2,5],12:[2,5],13:[2,5],16:[2,5],24:[2,5],26:[2,5],28:[2,5],29:[2,5],31:[2,5],32:[2,5],34:[2,5]},{5:[2,6],12:[2,6],13:[2,6],16:[2,6],24:[2,6],26:[2,6],28:[2,6],29:[2,6],31:[2,6],32:[2,6],34:[2,6]},{5:[2,7],12:[2,7],13:[2,7],16:[2,7],24:[2,7],26:[2,7],28:[2,7],29:[2,7],31:[2,7],32:[2,7],34:[2,7]},{5:[2,8],12:[2,8],13:[2,8],16:[2,8],24:[2,8],26:[2,8],28:[2,8],29:[2,8],31:[2,8],32:[2,8],34:[2,8]},{17:21,30:22,41:23,50:[1,26],52:[1,25],53:24},{17:27,30:22,41:23,50:[1,26],52:[1,25],53:24},{4:28,6:3,12:[2,38],13:[2,38],16:[2,38],24:[2,38],26:[2,38],28:[2,38],29:[2,38],31:[2,38],32:[2,38],34:[2,38]},{4:29,6:3,12:[2,38],13:[2,38],16:[2,38],24:[2,38],26:[2,38],28:[2,38],29:[2,38],31:[2,38],32:[2,38],34:[2,38]},{12:[1,30]},{30:32,35:31,42:[1,33],43:[1,34],50:[1,26],53:24},{17:35,30:22,41:23,50:[1,26],52:[1,25],53:24},{17:36,30:22,41:23,50:[1,26],52:[1,25],53:24},{17:37,30:22,41:23,50:[1,26],52:[1,25],53:24},{25:[1,38]},{18:[2,48],25:[2,48],33:[2,48],39:39,42:[2,48],43:[2,48],44:[2,48],45:[2,48],46:[2,48],50:[2,48],52:[2,48]},{18:[2,22],25:[2,22],33:[2,22],46:[2,22]},{18:[2,35],25:[2,35],33:[2,35],42:[2,35],43:[2,35],44:[2,35],45:[2,35],46:[2,35],50:[2,35],52:[2,35],54:[1,40]},{30:41,50:[1,26],53:24},{18:[2,37],25:[2,37],33:[2,37],42:[2,37],43:[2,37],44:[2,37],45:[2,37],46:[2,37],50:[2,37],52:[2,37],54:[2,37]},{33:[1,42]},{20:43,27:44,28:[1,45],29:[2,40]},{23:46,27:47,28:[1,45],29:[2,42]},{15:[1,48]},{25:[2,46],30:51,36:49,38:50,41:55,42:[1,52],43:[1,53],44:[1,54],45:[1,56],47:57,48:58,49:60,50:[1,59],52:[1,25],53:24},{25:[2,31],42:[2,31],43:[2,31],44:[2,31],45:[2,31],50:[2,31],52:[2,31]},{25:[2,32],42:[2,32],43:[2,32],44:[2,32],45:[2,32],50:[2,32],52:[2,32]},{25:[2,33],42:[2,33],43:[2,33],44:[2,33],45:[2,33],50:[2,33],52:[2,33]},{25:[1,61]},{25:[1,62]},{18:[1,63]},{5:[2,17],12:[2,17],13:[2,17],16:[2,17],24:[2,17],26:[2,17],28:[2,17],29:[2,17],31:[2,17],32:[2,17],34:[2,17]},{18:[2,50],25:[2,50],30:51,33:[2,50],36:65,40:64,41:55,42:[1,52],43:[1,53],44:[1,54],45:[1,56],46:[2,50],47:66,48:58,49:60,50:[1,59],52:[1,25],53:24},{50:[1,67]},{18:[2,34],25:[2,34],33:[2,34],42:[2,34],43:[2,34],44:[2,34],45:[2,34],46:[2,34],50:[2,34],52:[2,34]},{5:[2,18],12:[2,18],13:[2,18],16:[2,18],24:[2,18],26:[2,18],28:[2,18],29:[2,18],31:[2,18],32:[2,18],34:[2,18]},{21:68,29:[1,69]},{29:[2,41]},{4:70,6:3,12:[2,38],13:[2,38],16:[2,38],24:[2,38],26:[2,38],29:[2,38],31:[2,38],32:[2,38],34:[2,38]},{21:71,29:[1,69]},{29:[2,43]},{5:[2,9],12:[2,9],13:[2,9],16:[2,9],24:[2,9],26:[2,9],28:[2,9],29:[2,9],31:[2,9],32:[2,9],34:[2,9]},{25:[2,44],37:72,47:73,48:58,49:60,50:[1,74]},{25:[1,75]},{18:[2,23],25:[2,23],33:[2,23],42:[2,23],43:[2,23],44:[2,23],45:[2,23],46:[2,23],50:[2,23],52:[2,23]},{18:[2,24],25:[2,24],33:[2,24],42:[2,24],43:[2,24],44:[2,24],45:[2,24],46:[2,24],50:[2,24],52:[2,24]},{18:[2,25],25:[2,25],33:[2,25],42:[2,25],43:[2,25],44:[2,25],45:[2,25],46:[2,25],50:[2,25],52:[2,25]},{18:[2,26],25:[2,26],33:[2,26],42:[2,26],43:[2,26],44:[2,26],45:[2,26],46:[2,26],50:[2,26],52:[2,26]},{18:[2,27],25:[2,27],33:[2,27],42:[2,27],43:[2,27],44:[2,27],45:[2,27],46:[2,27],50:[2,27],52:[2,27]},{17:76,30:22,41:23,50:[1,26],52:[1,25],53:24},{25:[2,47]},{18:[2,29],25:[2,29],33:[2,29],46:[2,29],49:77,50:[1,74]},{18:[2,37],25:[2,37],33:[2,37],42:[2,37],43:[2,37],44:[2,37],45:[2,37],46:[2,37],50:[2,37],51:[1,78],52:[2,37],54:[2,37]},{18:[2,52],25:[2,52],33:[2,52],46:[2,52],50:[2,52]},{12:[2,13],13:[2,13],16:[2,13],24:[2,13],26:[2,13],28:[2,13],29:[2,13],31:[2,13],32:[2,13],34:[2,13]},{12:[2,14],13:[2,14],16:[2,14],24:[2,14],26:[2,14],28:[2,14],29:[2,14],31:[2,14],32:[2,14],34:[2,14]},{12:[2,10]},{18:[2,21],25:[2,21],33:[2,21],46:[2,21]},{18:[2,49],25:[2,49],33:[2,49],42:[2,49],43:[2,49],44:[2,49],45:[2,49],46:[2,49],50:[2,49],52:[2,49]},{18:[2,51],25:[2,51],33:[2,51],46:[2,51]},{18:[2,36],25:[2,36],33:[2,36],42:[2,36],43:[2,36],44:[2,36],45:[2,36],46:[2,36],50:[2,36],52:[2,36],54:[2,36]},{5:[2,11],12:[2,11],13:[2,11],16:[2,11],24:[2,11],26:[2,11],28:[2,11],29:[2,11],31:[2,11],32:[2,11],34:[2,11]},{30:79,50:[1,26],53:24},{29:[2,15]},{5:[2,12],12:[2,12],13:[2,12],16:[2,12],24:[2,12],26:[2,12],28:[2,12],29:[2,12],31:[2,12],32:[2,12],34:[2,12]},{25:[1,80]},{25:[2,45]},{51:[1,78]},{5:[2,20],12:[2,20],13:[2,20],16:[2,20],24:[2,20],26:[2,20],28:[2,20],29:[2,20],31:[2,20],32:[2,20],34:[2,20]},{46:[1,81]},{18:[2,53],25:[2,53],33:[2,53],46:[2,53],50:[2,53]},{30:51,36:82,41:55,42:[1,52],43:[1,53],44:[1,54],45:[1,56],50:[1,26],52:[1,25],53:24},{25:[1,83]},{5:[2,19],12:[2,19],13:[2,19],16:[2,19],24:[2,19],26:[2,19],28:[2,19],29:[2,19],31:[2,19],32:[2,19],34:[2,19]},{18:[2,28],25:[2,28],33:[2,28],42:[2,28],43:[2,28],44:[2,28],45:[2,28],46:[2,28],50:[2,28],52:[2,28]},{18:[2,30],25:[2,30],33:[2,30],46:[2,30],50:[2,30]},{5:[2,16],12:[2,16],13:[2,16],16:[2,16],24:[2,16],26:[2,16],28:[2,16],29:[2,16],31:[2,16],32:[2,16],34:[2,16]}], + defaultActions: {4:[2,1],44:[2,41],47:[2,43],57:[2,47],63:[2,10],70:[2,15],73:[2,45]}, + parseError: function parseError(str, hash) { + throw new Error(str); + }, + parse: function parse(input) { + var self = this, stack = [0], vstack = [null], lstack = [], table = this.table, yytext = "", yylineno = 0, yyleng = 0, recovering = 0, TERROR = 2, EOF = 1; + this.lexer.setInput(input); + this.lexer.yy = this.yy; + this.yy.lexer = this.lexer; + this.yy.parser = this; + if (typeof this.lexer.yylloc == "undefined") + this.lexer.yylloc = {}; + var yyloc = this.lexer.yylloc; + lstack.push(yyloc); + var ranges = this.lexer.options && this.lexer.options.ranges; + if (typeof this.yy.parseError === "function") + this.parseError = this.yy.parseError; + function popStack(n) { + stack.length = stack.length - 2 * n; + vstack.length = vstack.length - n; + lstack.length = lstack.length - n; + } + function lex() { + var token; + token = self.lexer.lex() || 1; + if (typeof token !== "number") { + token = self.symbols_[token] || token; + } + return token; + } + var symbol, preErrorSymbol, state, action, a, r, yyval = {}, p, len, newState, expected; + while (true) { + state = stack[stack.length - 1]; + if (this.defaultActions[state]) { + action = this.defaultActions[state]; + } else { + if (symbol === null || typeof symbol == "undefined") { + symbol = lex(); + } + action = table[state] && table[state][symbol]; + } + if (typeof action === "undefined" || !action.length || !action[0]) { + var errStr = ""; + if (!recovering) { + expected = []; + for (p in table[state]) + if (this.terminals_[p] && p > 2) { + expected.push("'" + this.terminals_[p] + "'"); + } + if (this.lexer.showPosition) { + errStr = "Parse error on line " + (yylineno + 1) + ":\n" + this.lexer.showPosition() + "\nExpecting " + expected.join(", ") + ", got '" + (this.terminals_[symbol] || symbol) + "'"; + } else { + errStr = "Parse error on line " + (yylineno + 1) + ": Unexpected " + (symbol == 1?"end of input":"'" + (this.terminals_[symbol] || symbol) + "'"); + } + this.parseError(errStr, {text: this.lexer.match, token: this.terminals_[symbol] || symbol, line: this.lexer.yylineno, loc: yyloc, expected: expected}); + } + } + if (action[0] instanceof Array && action.length > 1) { + throw new Error("Parse Error: multiple actions possible at state: " + state + ", token: " + symbol); + } + switch (action[0]) { + case 1: + stack.push(symbol); + vstack.push(this.lexer.yytext); + lstack.push(this.lexer.yylloc); + stack.push(action[1]); + symbol = null; + if (!preErrorSymbol) { + yyleng = this.lexer.yyleng; + yytext = this.lexer.yytext; + yylineno = this.lexer.yylineno; + yyloc = this.lexer.yylloc; + if (recovering > 0) + recovering--; + } else { + symbol = preErrorSymbol; + preErrorSymbol = null; + } + break; + case 2: + len = this.productions_[action[1]][1]; + yyval.$ = vstack[vstack.length - len]; + yyval._$ = {first_line: lstack[lstack.length - (len || 1)].first_line, last_line: lstack[lstack.length - 1].last_line, first_column: lstack[lstack.length - (len || 1)].first_column, last_column: lstack[lstack.length - 1].last_column}; + if (ranges) { + yyval._$.range = [lstack[lstack.length - (len || 1)].range[0], lstack[lstack.length - 1].range[1]]; + } + r = this.performAction.call(yyval, yytext, yyleng, yylineno, this.yy, action[1], vstack, lstack); + if (typeof r !== "undefined") { + return r; + } + if (len) { + stack = stack.slice(0, -1 * len * 2); + vstack = vstack.slice(0, -1 * len); + lstack = lstack.slice(0, -1 * len); + } + stack.push(this.productions_[action[1]][0]); + vstack.push(yyval.$); + lstack.push(yyval._$); + newState = table[stack[stack.length - 2]][stack[stack.length - 1]]; + stack.push(newState); + break; + case 3: + return true; + } + } + return true; + } + }; + /* Jison generated lexer */ + var lexer = (function(){ + var lexer = ({EOF:1, + parseError:function parseError(str, hash) { + if (this.yy.parser) { + this.yy.parser.parseError(str, hash); + } else { + throw new Error(str); + } + }, + setInput:function (input) { + this._input = input; + this._more = this._less = this.done = false; + this.yylineno = this.yyleng = 0; + this.yytext = this.matched = this.match = ''; + this.conditionStack = ['INITIAL']; + this.yylloc = {first_line:1,first_column:0,last_line:1,last_column:0}; + if (this.options.ranges) this.yylloc.range = [0,0]; + this.offset = 0; + return this; + }, + input:function () { + var ch = this._input[0]; + this.yytext += ch; + this.yyleng++; + this.offset++; + this.match += ch; + this.matched += ch; + var lines = ch.match(/(?:\r\n?|\n).*/g); + if (lines) { + this.yylineno++; + this.yylloc.last_line++; + } else { + this.yylloc.last_column++; + } + if (this.options.ranges) this.yylloc.range[1]++; + + this._input = this._input.slice(1); + return ch; + }, + unput:function (ch) { + var len = ch.length; + var lines = ch.split(/(?:\r\n?|\n)/g); + + this._input = ch + this._input; + this.yytext = this.yytext.substr(0, this.yytext.length-len-1); + //this.yyleng -= len; + this.offset -= len; + var oldLines = this.match.split(/(?:\r\n?|\n)/g); + this.match = this.match.substr(0, this.match.length-1); + this.matched = this.matched.substr(0, this.matched.length-1); + + if (lines.length-1) this.yylineno -= lines.length-1; + var r = this.yylloc.range; + + this.yylloc = {first_line: this.yylloc.first_line, + last_line: this.yylineno+1, + first_column: this.yylloc.first_column, + last_column: lines ? + (lines.length === oldLines.length ? this.yylloc.first_column : 0) + oldLines[oldLines.length - lines.length].length - lines[0].length: + this.yylloc.first_column - len + }; + + if (this.options.ranges) { + this.yylloc.range = [r[0], r[0] + this.yyleng - len]; + } + return this; + }, + more:function () { + this._more = true; + return this; + }, + less:function (n) { + this.unput(this.match.slice(n)); + }, + pastInput:function () { + var past = this.matched.substr(0, this.matched.length - this.match.length); + return (past.length > 20 ? '...':'') + past.substr(-20).replace(/\n/g, ""); + }, + upcomingInput:function () { + var next = this.match; + if (next.length < 20) { + next += this._input.substr(0, 20-next.length); + } + return (next.substr(0,20)+(next.length > 20 ? '...':'')).replace(/\n/g, ""); + }, + showPosition:function () { + var pre = this.pastInput(); + var c = new Array(pre.length + 1).join("-"); + return pre + this.upcomingInput() + "\n" + c+"^"; + }, + next:function () { + if (this.done) { + return this.EOF; + } + if (!this._input) this.done = true; + + var token, + match, + tempMatch, + index, + col, + lines; + if (!this._more) { + this.yytext = ''; + this.match = ''; + } + var rules = this._currentRules(); + for (var i=0;i < rules.length; i++) { + tempMatch = this._input.match(this.rules[rules[i]]); + if (tempMatch && (!match || tempMatch[0].length > match[0].length)) { + match = tempMatch; + index = i; + if (!this.options.flex) break; + } + } + if (match) { + lines = match[0].match(/(?:\r\n?|\n).*/g); + if (lines) this.yylineno += lines.length; + this.yylloc = {first_line: this.yylloc.last_line, + last_line: this.yylineno+1, + first_column: this.yylloc.last_column, + last_column: lines ? lines[lines.length-1].length-lines[lines.length-1].match(/\r?\n?/)[0].length : this.yylloc.last_column + match[0].length}; + this.yytext += match[0]; + this.match += match[0]; + this.matches = match; + this.yyleng = this.yytext.length; + if (this.options.ranges) { + this.yylloc.range = [this.offset, this.offset += this.yyleng]; + } + this._more = false; + this._input = this._input.slice(match[0].length); + this.matched += match[0]; + token = this.performAction.call(this, this.yy, this, rules[index],this.conditionStack[this.conditionStack.length-1]); + if (this.done && this._input) this.done = false; + if (token) return token; + else return; + } + if (this._input === "") { + return this.EOF; + } else { + return this.parseError('Lexical error on line '+(this.yylineno+1)+'. Unrecognized text.\n'+this.showPosition(), + {text: "", token: null, line: this.yylineno}); + } + }, + lex:function lex() { + var r = this.next(); + if (typeof r !== 'undefined') { + return r; + } else { + return this.lex(); + } + }, + begin:function begin(condition) { + this.conditionStack.push(condition); + }, + popState:function popState() { + return this.conditionStack.pop(); + }, + _currentRules:function _currentRules() { + return this.conditions[this.conditionStack[this.conditionStack.length-1]].rules; + }, + topState:function () { + return this.conditionStack[this.conditionStack.length-2]; + }, + pushState:function begin(condition) { + this.begin(condition); + }}); + lexer.options = {}; + lexer.performAction = function anonymous(yy,yy_,$avoiding_name_collisions,YY_START) { + + + function strip(start, end) { + return yy_.yytext = yy_.yytext.substr(start, yy_.yyleng-end); + } + + + var YYSTATE=YY_START + switch($avoiding_name_collisions) { + case 0: + if(yy_.yytext.slice(-2) === "\\\\") { + strip(0,1); + this.begin("mu"); + } else if(yy_.yytext.slice(-1) === "\\") { + strip(0,1); + this.begin("emu"); + } else { + this.begin("mu"); + } + if(yy_.yytext) return 12; + + break; + case 1:return 12; + break; + case 2: + this.popState(); + return 12; + + break; + case 3: + yy_.yytext = yy_.yytext.substr(5, yy_.yyleng-9); + this.popState(); + return 15; + + break; + case 4: return 12; + break; + case 5:strip(0,4); this.popState(); return 13; + break; + case 6:return 45; + break; + case 7:return 46; + break; + case 8: return 16; + break; + case 9: + this.popState(); + this.begin('raw'); + return 18; + + break; + case 10:return 34; + break; + case 11:return 24; + break; + case 12:return 29; + break; + case 13:this.popState(); return 28; + break; + case 14:this.popState(); return 28; + break; + case 15:return 26; + break; + case 16:return 26; + break; + case 17:return 32; + break; + case 18:return 31; + break; + case 19:this.popState(); this.begin('com'); + break; + case 20:strip(3,5); this.popState(); return 13; + break; + case 21:return 31; + break; + case 22:return 51; + break; + case 23:return 50; + break; + case 24:return 50; + break; + case 25:return 54; + break; + case 26:// ignore whitespace + break; + case 27:this.popState(); return 33; + break; + case 28:this.popState(); return 25; + break; + case 29:yy_.yytext = strip(1,2).replace(/\\"/g,'"'); return 42; + break; + case 30:yy_.yytext = strip(1,2).replace(/\\'/g,"'"); return 42; + break; + case 31:return 52; + break; + case 32:return 44; + break; + case 33:return 44; + break; + case 34:return 43; + break; + case 35:return 50; + break; + case 36:yy_.yytext = strip(1,2); return 50; + break; + case 37:return 'INVALID'; + break; + case 38:return 5; + break; + } + }; + lexer.rules = [/^(?:[^\x00]*?(?=(\{\{)))/,/^(?:[^\x00]+)/,/^(?:[^\x00]{2,}?(?=(\{\{|\\\{\{|\\\\\{\{|$)))/,/^(?:\{\{\{\{\/[^\s!"#%-,\.\/;->@\[-\^`\{-~]+(?=[=}\s\/.])\}\}\}\})/,/^(?:[^\x00]*?(?=(\{\{\{\{\/)))/,/^(?:[\s\S]*?--\}\})/,/^(?:\()/,/^(?:\))/,/^(?:\{\{\{\{)/,/^(?:\}\}\}\})/,/^(?:\{\{(~)?>)/,/^(?:\{\{(~)?#)/,/^(?:\{\{(~)?\/)/,/^(?:\{\{(~)?\^\s*(~)?\}\})/,/^(?:\{\{(~)?\s*else\s*(~)?\}\})/,/^(?:\{\{(~)?\^)/,/^(?:\{\{(~)?\s*else\b)/,/^(?:\{\{(~)?\{)/,/^(?:\{\{(~)?&)/,/^(?:\{\{!--)/,/^(?:\{\{![\s\S]*?\}\})/,/^(?:\{\{(~)?)/,/^(?:=)/,/^(?:\.\.)/,/^(?:\.(?=([=~}\s\/.)])))/,/^(?:[\/.])/,/^(?:\s+)/,/^(?:\}(~)?\}\})/,/^(?:(~)?\}\})/,/^(?:"(\\["]|[^"])*")/,/^(?:'(\\[']|[^'])*')/,/^(?:@)/,/^(?:true(?=([~}\s)])))/,/^(?:false(?=([~}\s)])))/,/^(?:-?[0-9]+(?:\.[0-9]+)?(?=([~}\s)])))/,/^(?:([^\s!"#%-,\.\/;->@\[-\^`\{-~]+(?=([=~}\s\/.)]))))/,/^(?:\[[^\]]*\])/,/^(?:.)/,/^(?:$)/]; + lexer.conditions = {"mu":{"rules":[6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38],"inclusive":false},"emu":{"rules":[2],"inclusive":false},"com":{"rules":[5],"inclusive":false},"raw":{"rules":[3,4],"inclusive":false},"INITIAL":{"rules":[0,1,38],"inclusive":true}}; + return lexer;})() + parser.lexer = lexer; + function Parser () { this.yy = {}; }Parser.prototype = parser;parser.Parser = Parser; + return new Parser; + })();__exports__ = handlebars; + /* jshint ignore:end */ + return __exports__; +})(); + +// handlebars/compiler/helpers.js +var __module10__ = (function(__dependency1__) { + "use strict"; + var __exports__ = {}; + var Exception = __dependency1__; + + function stripFlags(open, close) { + return { + left: open.charAt(2) === '~', + right: close.charAt(close.length-3) === '~' + }; + } + + __exports__.stripFlags = stripFlags; + function prepareBlock(mustache, program, inverseAndProgram, close, inverted, locInfo) { + /*jshint -W040 */ + if (mustache.sexpr.id.original !== close.path.original) { + throw new Exception(mustache.sexpr.id.original + ' doesn\'t match ' + close.path.original, mustache); + } + + var inverse = inverseAndProgram && inverseAndProgram.program; + + var strip = { + left: mustache.strip.left, + right: close.strip.right, + + // Determine the standalone candiacy. Basically flag our content as being possibly standalone + // so our parent can determine if we actually are standalone + openStandalone: isNextWhitespace(program.statements), + closeStandalone: isPrevWhitespace((inverse || program).statements) + }; + + if (mustache.strip.right) { + omitRight(program.statements, null, true); + } + + if (inverse) { + var inverseStrip = inverseAndProgram.strip; + + if (inverseStrip.left) { + omitLeft(program.statements, null, true); + } + if (inverseStrip.right) { + omitRight(inverse.statements, null, true); + } + if (close.strip.left) { + omitLeft(inverse.statements, null, true); + } + + // Find standalone else statments + if (isPrevWhitespace(program.statements) + && isNextWhitespace(inverse.statements)) { + + omitLeft(program.statements); + omitRight(inverse.statements); + } + } else { + if (close.strip.left) { + omitLeft(program.statements, null, true); + } + } + + if (inverted) { + return new this.BlockNode(mustache, inverse, program, strip, locInfo); + } else { + return new this.BlockNode(mustache, program, inverse, strip, locInfo); + } + } + + __exports__.prepareBlock = prepareBlock; + function prepareProgram(statements, isRoot) { + for (var i = 0, l = statements.length; i < l; i++) { + var current = statements[i], + strip = current.strip; + + if (!strip) { + continue; + } + + var _isPrevWhitespace = isPrevWhitespace(statements, i, isRoot, current.type === 'partial'), + _isNextWhitespace = isNextWhitespace(statements, i, isRoot), + + openStandalone = strip.openStandalone && _isPrevWhitespace, + closeStandalone = strip.closeStandalone && _isNextWhitespace, + inlineStandalone = strip.inlineStandalone && _isPrevWhitespace && _isNextWhitespace; + + if (strip.right) { + omitRight(statements, i, true); + } + if (strip.left) { + omitLeft(statements, i, true); + } + + if (inlineStandalone) { + omitRight(statements, i); + + if (omitLeft(statements, i)) { + // If we are on a standalone node, save the indent info for partials + if (current.type === 'partial') { + current.indent = (/([ \t]+$)/).exec(statements[i-1].original) ? RegExp.$1 : ''; + } + } + } + if (openStandalone) { + omitRight((current.program || current.inverse).statements); + + // Strip out the previous content node if it's whitespace only + omitLeft(statements, i); + } + if (closeStandalone) { + // Always strip the next node + omitRight(statements, i); + + omitLeft((current.inverse || current.program).statements); + } + } + + return statements; + } + + __exports__.prepareProgram = prepareProgram;function isPrevWhitespace(statements, i, isRoot) { + if (i === undefined) { + i = statements.length; + } + + // Nodes that end with newlines are considered whitespace (but are special + // cased for strip operations) + var prev = statements[i-1], + sibling = statements[i-2]; + if (!prev) { + return isRoot; + } + + if (prev.type === 'content') { + return (sibling || !isRoot ? (/\r?\n\s*?$/) : (/(^|\r?\n)\s*?$/)).test(prev.original); + } + } + function isNextWhitespace(statements, i, isRoot) { + if (i === undefined) { + i = -1; + } + + var next = statements[i+1], + sibling = statements[i+2]; + if (!next) { + return isRoot; + } + + if (next.type === 'content') { + return (sibling || !isRoot ? (/^\s*?\r?\n/) : (/^\s*?(\r?\n|$)/)).test(next.original); + } + } + + // Marks the node to the right of the position as omitted. + // I.e. {{foo}}' ' will mark the ' ' node as omitted. + // + // If i is undefined, then the first child will be marked as such. + // + // If mulitple is truthy then all whitespace will be stripped out until non-whitespace + // content is met. + function omitRight(statements, i, multiple) { + var current = statements[i == null ? 0 : i + 1]; + if (!current || current.type !== 'content' || (!multiple && current.rightStripped)) { + return; + } + + var original = current.string; + current.string = current.string.replace(multiple ? (/^\s+/) : (/^[ \t]*\r?\n?/), ''); + current.rightStripped = current.string !== original; + } + + // Marks the node to the left of the position as omitted. + // I.e. ' '{{foo}} will mark the ' ' node as omitted. + // + // If i is undefined then the last child will be marked as such. + // + // If mulitple is truthy then all whitespace will be stripped out until non-whitespace + // content is met. + function omitLeft(statements, i, multiple) { + var current = statements[i == null ? statements.length - 1 : i - 1]; + if (!current || current.type !== 'content' || (!multiple && current.leftStripped)) { + return; + } + + // We omit the last node if it's whitespace only and not preceeded by a non-content node. + var original = current.string; + current.string = current.string.replace(multiple ? (/\s+$/) : (/[ \t]+$/), ''); + current.leftStripped = current.string !== original; + return current.leftStripped; + } + return __exports__; +})(__module5__); + +// handlebars/compiler/base.js +var __module8__ = (function(__dependency1__, __dependency2__, __dependency3__, __dependency4__) { + "use strict"; + var __exports__ = {}; + var parser = __dependency1__; + var AST = __dependency2__; + var Helpers = __dependency3__; + var extend = __dependency4__.extend; + + __exports__.parser = parser; + + var yy = {}; + extend(yy, Helpers, AST); + + function parse(input) { + // Just return if an already-compile AST was passed in. + if (input.constructor === AST.ProgramNode) { return input; } + + parser.yy = yy; + + return parser.parse(input); + } + + __exports__.parse = parse; + return __exports__; +})(__module9__, __module7__, __module10__, __module3__); + +// handlebars/compiler/compiler.js +var __module11__ = (function(__dependency1__, __dependency2__) { + "use strict"; + var __exports__ = {}; + var Exception = __dependency1__; + var isArray = __dependency2__.isArray; + + var slice = [].slice; + + function Compiler() {} + + __exports__.Compiler = Compiler;// the foundHelper register will disambiguate helper lookup from finding a + // function in a context. This is necessary for mustache compatibility, which + // requires that context functions in blocks are evaluated by blockHelperMissing, + // and then proceed as if the resulting value was provided to blockHelperMissing. + + Compiler.prototype = { + compiler: Compiler, + + equals: function(other) { + var len = this.opcodes.length; + if (other.opcodes.length !== len) { + return false; + } + + for (var i = 0; i < len; i++) { + var opcode = this.opcodes[i], + otherOpcode = other.opcodes[i]; + if (opcode.opcode !== otherOpcode.opcode || !argEquals(opcode.args, otherOpcode.args)) { + return false; + } + } + + // We know that length is the same between the two arrays because they are directly tied + // to the opcode behavior above. + len = this.children.length; + for (i = 0; i < len; i++) { + if (!this.children[i].equals(other.children[i])) { + return false; + } + } + + return true; + }, + + guid: 0, + + compile: function(program, options) { + this.opcodes = []; + this.children = []; + this.depths = {list: []}; + this.options = options; + this.stringParams = options.stringParams; + this.trackIds = options.trackIds; + + // These changes will propagate to the other compiler components + var knownHelpers = this.options.knownHelpers; + this.options.knownHelpers = { + 'helperMissing': true, + 'blockHelperMissing': true, + 'each': true, + 'if': true, + 'unless': true, + 'with': true, + 'log': true, + 'lookup': true + }; + if (knownHelpers) { + for (var name in knownHelpers) { + this.options.knownHelpers[name] = knownHelpers[name]; + } + } + + return this.accept(program); + }, + + accept: function(node) { + return this[node.type](node); + }, + + program: function(program) { + var statements = program.statements; + + for(var i=0, l=statements.length; i 0) { + varDeclarations += ", " + locals.join(", "); + } + + // Generate minimizer alias mappings + for (var alias in this.aliases) { + if (this.aliases.hasOwnProperty(alias)) { + varDeclarations += ', ' + alias + '=' + this.aliases[alias]; + } + } + + var params = ["depth0", "helpers", "partials", "data"]; + + if (this.useDepths) { + params.push('depths'); + } + + // Perform a second pass over the output to merge content when possible + var source = this.mergeSource(varDeclarations); + + if (asObject) { + params.push(source); + + return Function.apply(this, params); + } else { + return 'function(' + params.join(',') + ') {\n ' + source + '}'; + } + }, + mergeSource: function(varDeclarations) { + var source = '', + buffer, + appendOnly = !this.forceBuffer, + appendFirst; + + for (var i = 0, len = this.source.length; i < len; i++) { + var line = this.source[i]; + if (line.appendToBuffer) { + if (buffer) { + buffer = buffer + '\n + ' + line.content; + } else { + buffer = line.content; + } + } else { + if (buffer) { + if (!source) { + appendFirst = true; + source = buffer + ';\n '; + } else { + source += 'buffer += ' + buffer + ';\n '; + } + buffer = undefined; + } + source += line + '\n '; + + if (!this.environment.isSimple) { + appendOnly = false; + } + } + } + + if (appendOnly) { + if (buffer || !source) { + source += 'return ' + (buffer || '""') + ';\n'; + } + } else { + varDeclarations += ", buffer = " + (appendFirst ? '' : this.initializeBuffer()); + if (buffer) { + source += 'return buffer + ' + buffer + ';\n'; + } else { + source += 'return buffer;\n'; + } + } + + if (varDeclarations) { + source = 'var ' + varDeclarations.substring(2) + (appendFirst ? '' : ';\n ') + source; + } + + return source; + }, + + // [blockValue] + // + // On stack, before: hash, inverse, program, value + // On stack, after: return value of blockHelperMissing + // + // The purpose of this opcode is to take a block of the form + // `{{#this.foo}}...{{/this.foo}}`, resolve the value of `foo`, and + // replace it on the stack with the result of properly + // invoking blockHelperMissing. + blockValue: function(name) { + this.aliases.blockHelperMissing = 'helpers.blockHelperMissing'; + + var params = [this.contextName(0)]; + this.setupParams(name, 0, params); + + var blockName = this.popStack(); + params.splice(1, 0, blockName); + + this.push('blockHelperMissing.call(' + params.join(', ') + ')'); + }, + + // [ambiguousBlockValue] + // + // On stack, before: hash, inverse, program, value + // Compiler value, before: lastHelper=value of last found helper, if any + // On stack, after, if no lastHelper: same as [blockValue] + // On stack, after, if lastHelper: value + ambiguousBlockValue: function() { + this.aliases.blockHelperMissing = 'helpers.blockHelperMissing'; + + // We're being a bit cheeky and reusing the options value from the prior exec + var params = [this.contextName(0)]; + this.setupParams('', 0, params, true); + + this.flushInline(); + + var current = this.topStack(); + params.splice(1, 0, current); + + this.pushSource("if (!" + this.lastHelper + ") { " + current + " = blockHelperMissing.call(" + params.join(", ") + "); }"); + }, + + // [appendContent] + // + // On stack, before: ... + // On stack, after: ... + // + // Appends the string value of `content` to the current buffer + appendContent: function(content) { + if (this.pendingContent) { + content = this.pendingContent + content; + } + + this.pendingContent = content; + }, + + // [append] + // + // On stack, before: value, ... + // On stack, after: ... + // + // Coerces `value` to a String and appends it to the current buffer. + // + // If `value` is truthy, or 0, it is coerced into a string and appended + // Otherwise, the empty string is appended + append: function() { + // Force anything that is inlined onto the stack so we don't have duplication + // when we examine local + this.flushInline(); + var local = this.popStack(); + this.pushSource('if (' + local + ' != null) { ' + this.appendToBuffer(local) + ' }'); + if (this.environment.isSimple) { + this.pushSource("else { " + this.appendToBuffer("''") + " }"); + } + }, + + // [appendEscaped] + // + // On stack, before: value, ... + // On stack, after: ... + // + // Escape `value` and append it to the buffer + appendEscaped: function() { + this.aliases.escapeExpression = 'this.escapeExpression'; + + this.pushSource(this.appendToBuffer("escapeExpression(" + this.popStack() + ")")); + }, + + // [getContext] + // + // On stack, before: ... + // On stack, after: ... + // Compiler value, after: lastContext=depth + // + // Set the value of the `lastContext` compiler value to the depth + getContext: function(depth) { + this.lastContext = depth; + }, + + // [pushContext] + // + // On stack, before: ... + // On stack, after: currentContext, ... + // + // Pushes the value of the current context onto the stack. + pushContext: function() { + this.pushStackLiteral(this.contextName(this.lastContext)); + }, + + // [lookupOnContext] + // + // On stack, before: ... + // On stack, after: currentContext[name], ... + // + // Looks up the value of `name` on the current context and pushes + // it onto the stack. + lookupOnContext: function(parts, falsy, scoped) { + /*jshint -W083 */ + var i = 0, + len = parts.length; + + if (!scoped && this.options.compat && !this.lastContext) { + // The depthed query is expected to handle the undefined logic for the root level that + // is implemented below, so we evaluate that directly in compat mode + this.push(this.depthedLookup(parts[i++])); + } else { + this.pushContext(); + } + + for (; i < len; i++) { + this.replaceStack(function(current) { + var lookup = this.nameLookup(current, parts[i], 'context'); + // We want to ensure that zero and false are handled properly if the context (falsy flag) + // needs to have the special handling for these values. + if (!falsy) { + return ' != null ? ' + lookup + ' : ' + current; + } else { + // Otherwise we can use generic falsy handling + return ' && ' + lookup; + } + }); + } + }, + + // [lookupData] + // + // On stack, before: ... + // On stack, after: data, ... + // + // Push the data lookup operator + lookupData: function(depth, parts) { + /*jshint -W083 */ + if (!depth) { + this.pushStackLiteral('data'); + } else { + this.pushStackLiteral('this.data(data, ' + depth + ')'); + } + + var len = parts.length; + for (var i = 0; i < len; i++) { + this.replaceStack(function(current) { + return ' && ' + this.nameLookup(current, parts[i], 'data'); + }); + } + }, + + // [resolvePossibleLambda] + // + // On stack, before: value, ... + // On stack, after: resolved value, ... + // + // If the `value` is a lambda, replace it on the stack by + // the return value of the lambda + resolvePossibleLambda: function() { + this.aliases.lambda = 'this.lambda'; + + this.push('lambda(' + this.popStack() + ', ' + this.contextName(0) + ')'); + }, + + // [pushStringParam] + // + // On stack, before: ... + // On stack, after: string, currentContext, ... + // + // This opcode is designed for use in string mode, which + // provides the string value of a parameter along with its + // depth rather than resolving it immediately. + pushStringParam: function(string, type) { + this.pushContext(); + this.pushString(type); + + // If it's a subexpression, the string result + // will be pushed after this opcode. + if (type !== 'sexpr') { + if (typeof string === 'string') { + this.pushString(string); + } else { + this.pushStackLiteral(string); + } + } + }, + + emptyHash: function() { + this.pushStackLiteral('{}'); + + if (this.trackIds) { + this.push('{}'); // hashIds + } + if (this.stringParams) { + this.push('{}'); // hashContexts + this.push('{}'); // hashTypes + } + }, + pushHash: function() { + if (this.hash) { + this.hashes.push(this.hash); + } + this.hash = {values: [], types: [], contexts: [], ids: []}; + }, + popHash: function() { + var hash = this.hash; + this.hash = this.hashes.pop(); + + if (this.trackIds) { + this.push('{' + hash.ids.join(',') + '}'); + } + if (this.stringParams) { + this.push('{' + hash.contexts.join(',') + '}'); + this.push('{' + hash.types.join(',') + '}'); + } + + this.push('{\n ' + hash.values.join(',\n ') + '\n }'); + }, + + // [pushString] + // + // On stack, before: ... + // On stack, after: quotedString(string), ... + // + // Push a quoted version of `string` onto the stack + pushString: function(string) { + this.pushStackLiteral(this.quotedString(string)); + }, + + // [push] + // + // On stack, before: ... + // On stack, after: expr, ... + // + // Push an expression onto the stack + push: function(expr) { + this.inlineStack.push(expr); + return expr; + }, + + // [pushLiteral] + // + // On stack, before: ... + // On stack, after: value, ... + // + // Pushes a value onto the stack. This operation prevents + // the compiler from creating a temporary variable to hold + // it. + pushLiteral: function(value) { + this.pushStackLiteral(value); + }, + + // [pushProgram] + // + // On stack, before: ... + // On stack, after: program(guid), ... + // + // Push a program expression onto the stack. This takes + // a compile-time guid and converts it into a runtime-accessible + // expression. + pushProgram: function(guid) { + if (guid != null) { + this.pushStackLiteral(this.programExpression(guid)); + } else { + this.pushStackLiteral(null); + } + }, + + // [invokeHelper] + // + // On stack, before: hash, inverse, program, params..., ... + // On stack, after: result of helper invocation + // + // Pops off the helper's parameters, invokes the helper, + // and pushes the helper's return value onto the stack. + // + // If the helper is not found, `helperMissing` is called. + invokeHelper: function(paramSize, name, isSimple) { + this.aliases.helperMissing = 'helpers.helperMissing'; + + var nonHelper = this.popStack(); + var helper = this.setupHelper(paramSize, name); + + var lookup = (isSimple ? helper.name + ' || ' : '') + nonHelper + ' || helperMissing'; + this.push('((' + lookup + ').call(' + helper.callParams + '))'); + }, + + // [invokeKnownHelper] + // + // On stack, before: hash, inverse, program, params..., ... + // On stack, after: result of helper invocation + // + // This operation is used when the helper is known to exist, + // so a `helperMissing` fallback is not required. + invokeKnownHelper: function(paramSize, name) { + var helper = this.setupHelper(paramSize, name); + this.push(helper.name + ".call(" + helper.callParams + ")"); + }, + + // [invokeAmbiguous] + // + // On stack, before: hash, inverse, program, params..., ... + // On stack, after: result of disambiguation + // + // This operation is used when an expression like `{{foo}}` + // is provided, but we don't know at compile-time whether it + // is a helper or a path. + // + // This operation emits more code than the other options, + // and can be avoided by passing the `knownHelpers` and + // `knownHelpersOnly` flags at compile-time. + invokeAmbiguous: function(name, helperCall) { + this.aliases.functionType = '"function"'; + this.aliases.helperMissing = 'helpers.helperMissing'; + this.useRegister('helper'); + + var nonHelper = this.popStack(); + + this.emptyHash(); + var helper = this.setupHelper(0, name, helperCall); + + var helperName = this.lastHelper = this.nameLookup('helpers', name, 'helper'); + + this.push( + '((helper = (helper = ' + helperName + ' || ' + nonHelper + ') != null ? helper : helperMissing' + + (helper.paramsInit ? '),(' + helper.paramsInit : '') + '),' + + '(typeof helper === functionType ? helper.call(' + helper.callParams + ') : helper))'); + }, + + // [invokePartial] + // + // On stack, before: context, ... + // On stack after: result of partial invocation + // + // This operation pops off a context, invokes a partial with that context, + // and pushes the result of the invocation back. + invokePartial: function(name, indent) { + var params = [this.nameLookup('partials', name, 'partial'), "'" + indent + "'", "'" + name + "'", this.popStack(), this.popStack(), "helpers", "partials"]; + + if (this.options.data) { + params.push("data"); + } else if (this.options.compat) { + params.push('undefined'); + } + if (this.options.compat) { + params.push('depths'); + } + + this.push("this.invokePartial(" + params.join(", ") + ")"); + }, + + // [assignToHash] + // + // On stack, before: value, ..., hash, ... + // On stack, after: ..., hash, ... + // + // Pops a value off the stack and assigns it to the current hash + assignToHash: function(key) { + var value = this.popStack(), + context, + type, + id; + + if (this.trackIds) { + id = this.popStack(); + } + if (this.stringParams) { + type = this.popStack(); + context = this.popStack(); + } + + var hash = this.hash; + if (context) { + hash.contexts.push("'" + key + "': " + context); + } + if (type) { + hash.types.push("'" + key + "': " + type); + } + if (id) { + hash.ids.push("'" + key + "': " + id); + } + hash.values.push("'" + key + "': (" + value + ")"); + }, + + pushId: function(type, name) { + if (type === 'ID' || type === 'DATA') { + this.pushString(name); + } else if (type === 'sexpr') { + this.pushStackLiteral('true'); + } else { + this.pushStackLiteral('null'); + } + }, + + // HELPERS + + compiler: JavaScriptCompiler, + + compileChildren: function(environment, options) { + var children = environment.children, child, compiler; + + for(var i=0, l=children.length; i this.stackVars.length) { this.stackVars.push("stack" + this.stackSlot); } + return this.topStackName(); + }, + topStackName: function() { + return "stack" + this.stackSlot; + }, + flushInline: function() { + var inlineStack = this.inlineStack; + if (inlineStack.length) { + this.inlineStack = []; + for (var i = 0, len = inlineStack.length; i < len; i++) { + var entry = inlineStack[i]; + if (entry instanceof Literal) { + this.compileStack.push(entry); + } else { + this.pushStack(entry); + } + } + } + }, + isInline: function() { + return this.inlineStack.length; + }, + + popStack: function(wrapped) { + var inline = this.isInline(), + item = (inline ? this.inlineStack : this.compileStack).pop(); + + if (!wrapped && (item instanceof Literal)) { + return item.value; + } else { + if (!inline) { + /* istanbul ignore next */ + if (!this.stackSlot) { + throw new Exception('Invalid stack pop'); + } + this.stackSlot--; + } + return item; + } + }, + + topStack: function() { + var stack = (this.isInline() ? this.inlineStack : this.compileStack), + item = stack[stack.length - 1]; + + if (item instanceof Literal) { + return item.value; + } else { + return item; + } + }, + + contextName: function(context) { + if (this.useDepths && context) { + return 'depths[' + context + ']'; + } else { + return 'depth' + context; + } + }, + + quotedString: function(str) { + return '"' + str + .replace(/\\/g, '\\\\') + .replace(/"/g, '\\"') + .replace(/\n/g, '\\n') + .replace(/\r/g, '\\r') + .replace(/\u2028/g, '\\u2028') // Per Ecma-262 7.3 + 7.8.4 + .replace(/\u2029/g, '\\u2029') + '"'; + }, + + objectLiteral: function(obj) { + var pairs = []; + + for (var key in obj) { + if (obj.hasOwnProperty(key)) { + pairs.push(this.quotedString(key) + ':' + obj[key]); + } + } + + return '{' + pairs.join(',') + '}'; + }, + + setupHelper: function(paramSize, name, blockHelper) { + var params = [], + paramsInit = this.setupParams(name, paramSize, params, blockHelper); + var foundHelper = this.nameLookup('helpers', name, 'helper'); + + return { + params: params, + paramsInit: paramsInit, + name: foundHelper, + callParams: [this.contextName(0)].concat(params).join(", ") + }; + }, + + setupOptions: function(helper, paramSize, params) { + var options = {}, contexts = [], types = [], ids = [], param, inverse, program; + + options.name = this.quotedString(helper); + options.hash = this.popStack(); + + if (this.trackIds) { + options.hashIds = this.popStack(); + } + if (this.stringParams) { + options.hashTypes = this.popStack(); + options.hashContexts = this.popStack(); + } + + inverse = this.popStack(); + program = this.popStack(); + + // Avoid setting fn and inverse if neither are set. This allows + // helpers to do a check for `if (options.fn)` + if (program || inverse) { + if (!program) { + program = 'this.noop'; + } + + if (!inverse) { + inverse = 'this.noop'; + } + + options.fn = program; + options.inverse = inverse; + } + + // The parameters go on to the stack in order (making sure that they are evaluated in order) + // so we need to pop them off the stack in reverse order + var i = paramSize; + while (i--) { + param = this.popStack(); + params[i] = param; + + if (this.trackIds) { + ids[i] = this.popStack(); + } + if (this.stringParams) { + types[i] = this.popStack(); + contexts[i] = this.popStack(); + } + } + + if (this.trackIds) { + options.ids = "[" + ids.join(",") + "]"; + } + if (this.stringParams) { + options.types = "[" + types.join(",") + "]"; + options.contexts = "[" + contexts.join(",") + "]"; + } + + if (this.options.data) { + options.data = "data"; + } + + return options; + }, + + // the params and contexts arguments are passed in arrays + // to fill in + setupParams: function(helperName, paramSize, params, useRegister) { + var options = this.objectLiteral(this.setupOptions(helperName, paramSize, params)); + + if (useRegister) { + this.useRegister('options'); + params.push('options'); + return 'options=' + options; + } else { + params.push(options); + return ''; + } + } + }; + + var reservedWords = ( + "break else new var" + + " case finally return void" + + " catch for switch while" + + " continue function this with" + + " default if throw" + + " delete in try" + + " do instanceof typeof" + + " abstract enum int short" + + " boolean export interface static" + + " byte extends long super" + + " char final native synchronized" + + " class float package throws" + + " const goto private transient" + + " debugger implements protected volatile" + + " double import public let yield" + ).split(" "); + + var compilerWords = JavaScriptCompiler.RESERVED_WORDS = {}; + + for(var i=0, l=reservedWords.length; i=j?(clearTimeout(e),e=null,g=i,f=a.apply(c,d)):e||(e=setTimeout(h,j)),f}},noop:function(){}}}(),c="0.10.5",d=function(){"use strict";function a(a){return a=b.toStr(a),a?a.split(/\s+/):[]}function c(a){return a=b.toStr(a),a?a.split(/\W+/):[]}function d(a){return function(){var c=[].slice.call(arguments,0);return function(d){var e=[];return b.each(c,function(c){e=e.concat(a(b.toStr(d[c])))}),e}}}return{nonword:c,whitespace:a,obj:{nonword:d(c),whitespace:d(a)}}}(),e=function(){"use strict";function c(c){this.maxSize=b.isNumber(c)?c:100,this.reset(),this.maxSize<=0&&(this.set=this.get=a.noop)}function d(){this.head=this.tail=null}function e(a,b){this.key=a,this.val=b,this.prev=this.next=null}return b.mixin(c.prototype,{set:function(a,b){var c,d=this.list.tail;this.size>=this.maxSize&&(this.list.remove(d),delete this.hash[d.key]),(c=this.hash[a])?(c.val=b,this.list.moveToFront(c)):(c=new e(a,b),this.list.add(c),this.hash[a]=c,this.size++)},get:function(a){var b=this.hash[a];return b?(this.list.moveToFront(b),b.val):void 0},reset:function(){this.size=0,this.hash={},this.list=new d}}),b.mixin(d.prototype,{add:function(a){this.head&&(a.next=this.head,this.head.prev=a),this.head=a,this.tail=this.tail||a},remove:function(a){a.prev?a.prev.next=a.next:this.head=a.next,a.next?a.next.prev=a.prev:this.tail=a.prev},moveToFront:function(a){this.remove(a),this.add(a)}}),c}(),f=function(){"use strict";function a(a){this.prefix=["__",a,"__"].join(""),this.ttlKey="__ttl__",this.keyMatcher=new RegExp("^"+b.escapeRegExChars(this.prefix))}function c(){return(new Date).getTime()}function d(a){return JSON.stringify(b.isUndefined(a)?null:a)}function e(a){return JSON.parse(a)}var f,g;try{f=window.localStorage,f.setItem("~~~","!"),f.removeItem("~~~")}catch(h){f=null}return g=f&&window.JSON?{_prefix:function(a){return this.prefix+a},_ttlKey:function(a){return this._prefix(a)+this.ttlKey},get:function(a){return this.isExpired(a)&&this.remove(a),e(f.getItem(this._prefix(a)))},set:function(a,e,g){return b.isNumber(g)?f.setItem(this._ttlKey(a),d(c()+g)):f.removeItem(this._ttlKey(a)),f.setItem(this._prefix(a),d(e))},remove:function(a){return f.removeItem(this._ttlKey(a)),f.removeItem(this._prefix(a)),this},clear:function(){var a,b,c=[],d=f.length;for(a=0;d>a;a++)(b=f.key(a)).match(this.keyMatcher)&&c.push(b.replace(this.keyMatcher,""));for(a=c.length;a--;)this.remove(c[a]);return this},isExpired:function(a){var d=e(f.getItem(this._ttlKey(a)));return b.isNumber(d)&&c()>d?!0:!1}}:{get:b.noop,set:b.noop,remove:b.noop,clear:b.noop,isExpired:b.noop},b.mixin(a.prototype,g),a}(),g=function(){"use strict";function c(b){b=b||{},this.cancelled=!1,this.lastUrl=null,this._send=b.transport?d(b.transport):a.ajax,this._get=b.rateLimiter?b.rateLimiter(this._get):this._get,this._cache=b.cache===!1?new e(0):i}function d(c){return function(d,e){function f(a){b.defer(function(){h.resolve(a)})}function g(a){b.defer(function(){h.reject(a)})}var h=a.Deferred();return c(d,e,f,g),h}}var f=0,g={},h=6,i=new e(10);return c.setMaxPendingRequests=function(a){h=a},c.resetCache=function(){i.reset()},b.mixin(c.prototype,{_get:function(a,b,c){function d(b){c&&c(null,b),k._cache.set(a,b)}function e(){c&&c(!0)}function i(){f--,delete g[a],k.onDeckRequestArgs&&(k._get.apply(k,k.onDeckRequestArgs),k.onDeckRequestArgs=null)}var j,k=this;this.cancelled||a!==this.lastUrl||((j=g[a])?j.done(d).fail(e):h>f?(f++,g[a]=this._send(a,b).done(d).fail(e).always(i)):this.onDeckRequestArgs=[].slice.call(arguments,0))},get:function(a,c,d){var e;return b.isFunction(c)&&(d=c,c={}),this.cancelled=!1,this.lastUrl=a,(e=this._cache.get(a))?b.defer(function(){d&&d(null,e)}):this._get(a,c,d),!!e},cancel:function(){this.cancelled=!0}}),c}(),h=function(){"use strict";function c(b){b=b||{},b.datumTokenizer&&b.queryTokenizer||a.error("datumTokenizer and queryTokenizer are both required"),this.datumTokenizer=b.datumTokenizer,this.queryTokenizer=b.queryTokenizer,this.reset()}function d(a){return a=b.filter(a,function(a){return!!a}),a=b.map(a,function(a){return a.toLowerCase()})}function e(){return{ids:[],children:{}}}function f(a){for(var b={},c=[],d=0,e=a.length;e>d;d++)b[a[d]]||(b[a[d]]=!0,c.push(a[d]));return c}function g(a,b){function c(a,b){return a-b}var d=0,e=0,f=[];a=a.sort(c),b=b.sort(c);for(var g=a.length,h=b.length;g>d&&h>e;)a[d]b[e]?e++:(f.push(a[d]),d++,e++);return f}return b.mixin(c.prototype,{bootstrap:function(a){this.datums=a.datums,this.trie=a.trie},add:function(a){var c=this;a=b.isArray(a)?a:[a],b.each(a,function(a){var f,g;f=c.datums.push(a)-1,g=d(c.datumTokenizer(a)),b.each(g,function(a){var b,d,g;for(b=c.trie,d=a.split("");g=d.shift();)b=b.children[g]||(b.children[g]=e()),b.ids.push(f)})})},get:function(a){var c,e,h=this;return c=d(this.queryTokenizer(a)),b.each(c,function(a){var b,c,d,f;if(e&&0===e.length)return!1;for(b=h.trie,c=a.split("");b&&(d=c.shift());)b=b.children[d];return b&&0===c.length?(f=b.ids.slice(0),void(e=e?g(e,f):f)):(e=[],!1)}),e?b.map(f(e),function(a){return h.datums[a]}):[]},reset:function(){this.datums=[],this.trie=e()},serialize:function(){return{datums:this.datums,trie:this.trie}}}),c}(),i=function(){"use strict";function d(a){return a.local||null}function e(d){var e,f;return f={url:null,thumbprint:"",ttl:864e5,filter:null,ajax:{}},(e=d.prefetch||null)&&(e=b.isString(e)?{url:e}:e,e=b.mixin(f,e),e.thumbprint=c+e.thumbprint,e.ajax.type=e.ajax.type||"GET",e.ajax.dataType=e.ajax.dataType||"json",!e.url&&a.error("prefetch requires url to be set")),e}function f(c){function d(a){return function(c){return b.debounce(c,a)}}function e(a){return function(c){return b.throttle(c,a)}}var f,g;return g={url:null,cache:!0,wildcard:"%QUERY",replace:null,rateLimitBy:"debounce",rateLimitWait:300,send:null,filter:null,ajax:{}},(f=c.remote||null)&&(f=b.isString(f)?{url:f}:f,f=b.mixin(g,f),f.rateLimiter=/^throttle$/i.test(f.rateLimitBy)?e(f.rateLimitWait):d(f.rateLimitWait),f.ajax.type=f.ajax.type||"GET",f.ajax.dataType=f.ajax.dataType||"json",delete f.rateLimitBy,delete f.rateLimitWait,!f.url&&a.error("remote requires url to be set")),f}return{local:d,prefetch:e,remote:f}}();!function(c){"use strict";function e(b){b&&(b.local||b.prefetch||b.remote)||a.error("one of local, prefetch, or remote is required"),this.limit=b.limit||5,this.sorter=j(b.sorter),this.dupDetector=b.dupDetector||k,this.local=i.local(b),this.prefetch=i.prefetch(b),this.remote=i.remote(b),this.cacheKey=this.prefetch?this.prefetch.cacheKey||this.prefetch.url:null,this.index=new h({datumTokenizer:b.datumTokenizer,queryTokenizer:b.queryTokenizer}),this.storage=this.cacheKey?new f(this.cacheKey):null}function j(a){function c(b){return b.sort(a)}function d(a){return a}return b.isFunction(a)?c:d}function k(){return!1}var l,m;return l=c.Bloodhound,m={data:"data",protocol:"protocol",thumbprint:"thumbprint"},c.Bloodhound=e,e.noConflict=function(){return c.Bloodhound=l,e},e.tokenizers=d,b.mixin(e.prototype,{_loadPrefetch:function(b){function c(a){f.clear(),f.add(b.filter?b.filter(a):a),f._saveToStorage(f.index.serialize(),b.thumbprint,b.ttl)}var d,e,f=this;return(d=this._readFromStorage(b.thumbprint))?(this.index.bootstrap(d),e=a.Deferred().resolve()):e=a.ajax(b.url,b.ajax).done(c),e},_getFromRemote:function(a,b){function c(a,c){b(a?[]:f.remote.filter?f.remote.filter(c):c)}var d,e,f=this;if(this.transport)return a=a||"",e=encodeURIComponent(a),d=this.remote.replace?this.remote.replace(this.remote.url,a):this.remote.url.replace(this.remote.wildcard,e),this.transport.get(d,this.remote.ajax,c)},_cancelLastRemoteRequest:function(){this.transport&&this.transport.cancel()},_saveToStorage:function(a,b,c){this.storage&&(this.storage.set(m.data,a,c),this.storage.set(m.protocol,location.protocol,c),this.storage.set(m.thumbprint,b,c))},_readFromStorage:function(a){var b,c={};return this.storage&&(c.data=this.storage.get(m.data),c.protocol=this.storage.get(m.protocol),c.thumbprint=this.storage.get(m.thumbprint)),b=c.thumbprint!==a||c.protocol!==location.protocol,c.data&&!b?c.data:null},_initialize:function(){function c(){e.add(b.isFunction(f)?f():f)}var d,e=this,f=this.local;return d=this.prefetch?this._loadPrefetch(this.prefetch):a.Deferred().resolve(),f&&d.done(c),this.transport=this.remote?new g(this.remote):null,this.initPromise=d.promise()},initialize:function(a){return!this.initPromise||a?this._initialize():this.initPromise},add:function(a){this.index.add(a)},get:function(a,c){function d(a){var d=f.slice(0);b.each(a,function(a){var c;return c=b.some(d,function(b){return e.dupDetector(a,b)}),!c&&d.push(a),d.length0||!this.transport)&&c&&c(f)},clear:function(){this.index.reset()},clearPrefetchCache:function(){this.storage&&this.storage.clear()},clearRemoteCache:function(){this.transport&&g.resetCache()},ttAdapter:function(){return b.bind(this.get,this)}}),e}(this);var j=function(){return{wrapper:'',dropdown:'',dataset:'
    ',suggestions:'',suggestion:'
    '}}(),k=function(){"use strict";var a={wrapper:{position:"relative",display:"inline-block"},hint:{position:"absolute",top:"0",left:"0",borderColor:"transparent",boxShadow:"none",opacity:"1"},input:{position:"relative",verticalAlign:"top",backgroundColor:"transparent"},inputWithNoHint:{position:"relative",verticalAlign:"top"},dropdown:{position:"absolute",top:"100%",left:"0",zIndex:"100",display:"none"},suggestions:{display:"block"},suggestion:{whiteSpace:"nowrap",cursor:"pointer"},suggestionChild:{whiteSpace:"normal"},ltr:{left:"0",right:"auto"},rtl:{left:"auto",right:" 0"}};return b.isMsie()&&b.mixin(a.input,{backgroundImage:"url(data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7)"}),b.isMsie()&&b.isMsie()<=7&&b.mixin(a.input,{marginTop:"-1px"}),a}(),l=function(){"use strict";function c(b){b&&b.el||a.error("EventBus initialized without el"),this.$el=a(b.el)}var d="typeahead:";return b.mixin(c.prototype,{trigger:function(a){var b=[].slice.call(arguments,1);this.$el.trigger(d+a,b)}}),c}(),m=function(){"use strict";function a(a,b,c,d){var e;if(!c)return this;for(b=b.split(i),c=d?h(c,d):c,this._callbacks=this._callbacks||{};e=b.shift();)this._callbacks[e]=this._callbacks[e]||{sync:[],async:[]},this._callbacks[e][a].push(c);return this}function b(b,c,d){return a.call(this,"async",b,c,d)}function c(b,c,d){return a.call(this,"sync",b,c,d)}function d(a){var b;if(!this._callbacks)return this;for(a=a.split(i);b=a.shift();)delete this._callbacks[b];return this}function e(a){var b,c,d,e,g;if(!this._callbacks)return this;for(a=a.split(i),d=[].slice.call(arguments,1);(b=a.shift())&&(c=this._callbacks[b]);)e=f(c.sync,this,[b].concat(d)),g=f(c.async,this,[b].concat(d)),e()&&j(g);return this}function f(a,b,c){function d(){for(var d,e=0,f=a.length;!d&&f>e;e+=1)d=a[e].apply(b,c)===!1;return!d}return d}function g(){var a;return a=window.setImmediate?function(a){setImmediate(function(){a()})}:function(a){setTimeout(function(){a()},0)}}function h(a,b){return a.bind?a.bind(b):function(){a.apply(b,[].slice.call(arguments,0))}}var i=/\s+/,j=g();return{onSync:c,onAsync:b,off:d,trigger:e}}(),n=function(a){"use strict";function c(a,c,d){for(var e,f=[],g=0,h=a.length;h>g;g++)f.push(b.escapeRegExChars(a[g]));return e=d?"\\b("+f.join("|")+")\\b":"("+f.join("|")+")",c?new RegExp(e):new RegExp(e,"i")}var d={node:null,pattern:null,tagName:"strong",className:null,wordsOnly:!1,caseSensitive:!1};return function(e){function f(b){var c,d,f;return(c=h.exec(b.data))&&(f=a.createElement(e.tagName),e.className&&(f.className=e.className),d=b.splitText(c.index),d.splitText(c[0].length),f.appendChild(d.cloneNode(!0)),b.parentNode.replaceChild(f,d)),!!c}function g(a,b){for(var c,d=3,e=0;e