Projects >> raxacore >>6749b47e6165899a375a119040d52d8db7a856da

Chunk
Conflicting content 
/**
 * Copyright 2012, Raxa
 *
<<<<<<< HEAD
 * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
 * the License. You may obtain a copy of the License at
 *
 * http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
 * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
 * specific language governing permissions and limitations under the License.
=======
 * Licensed under the Apache License, Version 2.0 (the "License"); you may not
 * use this file except in compliance with the License. You may obtain a copy of
 * the License at
 *
 * http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
 * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 * License for the specific language governing permissions and limitations under
 * the License.
>>>>>>> 1bb67fee8aba6179ae787c2e40b6f8dedf61c2be
 */
import java.util.List;
import org.openmrs.Encounter;
Solution content 
/**
 * Copyright 2012, Raxa
 *
 * Licensed under the Apache License, Version 2.0 (the "License"); you may not
 * use this file except in compliance with the License. You may obtain a copy of
 * the License at
 *
 * http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
 * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 * License for the specific language governing permissions and limitations under
 * the License.
 */
import java.util.List;
import org.openmrs.Encounter;
File
PatientListService.java
Developer's decision
Version 2
Kind of conflict
Comment
Chunk
Conflicting content 
import org.openmrs.Patient;
import org.openmrs.annotation.Authorized;
import org.openmrs.api.OpenmrsService;
<<<<<<< HEAD
import org.openmrs.util.PrivilegeConstants;
import org.raxa.module.raxacore.db.PatientListDAO;
/*
 * Interface for interacting with the PatientList
 */
public interface PatientListService extends OpenmrsService {
	
	/**
	 * Sets Patient List DAO
	 *
	 * @param dao
	 */
	public void setPatientListDAO(PatientListDAO dao);
	
	/**
	 * Saves PatientList
	 *
	 * @param patientList
	 * @return PatientList
	 */
	@Authorized( { "Add Patient Lists" })
	public PatientList savePatientList(PatientList patientList);
	
	/**
	 * Gets a PatientList by Id
	 *
	 * @param id
	 * @return PatientLists
	 */
	@Authorized( { "View Patient Lists" })
	public PatientList getPatientList(Integer id);
	
	/**
	 * Gets a PatientList by Name
	 *
	 * @param name
	 * @return list of PatientLists
	 */
	@Authorized( { "View Patient Lists" })
	public List getPatientListByName(String name);
	
	/**
	 * Gets PatientList by uuid
	 *
	 * @param uuid
	 * @return PatientList
	 */
	@Authorized( { "View Patient Lists" })
	public PatientList getPatientListByUuid(String uuid);
	
	/**
	 * Gets PatientLists by EncounterType
	 *
	 * @param encounterType
	 * @return list of PatientLists
	 */
	@Authorized(value = { "View Patient Lists", PrivilegeConstants.VIEW_ENCOUNTER_TYPES }, requireAll = true)
	public List getPatientListByEncounterType(EncounterType encounterType);
	
	/**
	 * Gets all patients in PatientList
	 *
	 * @param patientList
	 * @return list of Patients
	 */
	@Authorized(value = { "View Patient Lists", PrivilegeConstants.VIEW_PATIENTS }, requireAll = true)
	public List getPatientsInList(PatientList patientList);
	
	/**
	 * Gets all the encounters in PatientList
	 * 
	 * @param patientList
	 * @return list of Encounters
	 */
	@Authorized(value = { "View Patient Lists", PrivilegeConstants.VIEW_ENCOUNTERS }, requireAll = true)
	public List getEncountersInPatientList(PatientList patientList);
	
	/**
	 * Updates PatientList
	 *
	 * @param patientList
	 * @return PatientList
	 */
	@Authorized( { "Edit Patient Lists" })
	PatientList updatePatientList(PatientList patientList);
	
	/**
	 * Deletes PatientList
	 *
	 * @param patientList
	 */
	@Authorized( { "Delete Patient Lists" })
	public void deletePatientList(PatientList patientList);
=======

/**
 * Interface for interacting with the PatientList
 */
public interface PatientListService extends OpenmrsService {
	/*
	    public PatientList savePatientList(PatientList);
	    public List getPatientListByName(String);

	    public PatientList getPatientListByUuid(String);

	    public List getPatientListByEncounterType(EncounterType);

	    public List getPatientsInList(PatientList);

	    PatientList updatePatientList(PatientList);

	    public void deletePatientList(PatientList);
	*/
>>>>>>> 1bb67fee8aba6179ae787c2e40b6f8dedf61c2be
}
Solution content 
	 *
	 * @param dao
	 */
	 * @param id
	 */
	public void setPatientListDAO(PatientListDAO dao);
	
	/**
	 * Saves PatientList
	 *
	 * @param patientList
	 * @return PatientList
	@Authorized( { "Edit Patient Lists" })
	 */
	@Authorized( { "Add Patient Lists" })
	 * @return PatientLists
	 */
	@Authorized( { "View Patient Lists" })
	public PatientList getPatientList(Integer id);
	
	/**
	 * Gets a PatientList by Name
	 *
	 * @param name
	public PatientList savePatientList(PatientList patientList);
	
	/**
	 * Gets a PatientList by Id
	 *
	/**
	 * Sets Patient List DAO
import org.openmrs.Patient;
import org.openmrs.annotation.Authorized;
import org.openmrs.api.OpenmrsService;
import org.openmrs.util.PrivilegeConstants;
import org.raxa.module.raxacore.db.PatientListDAO;
/*
 * Interface for interacting with the PatientList
 */
public interface PatientListService extends OpenmrsService {
	
	 * @return list of PatientLists
	 */
	@Authorized( { "View Patient Lists" })
	public List getPatientListByName(String name);
	
	/**
	 * Gets PatientList by uuid
	 *
	 * @param uuid
	 * @return PatientList
	 */
	@Authorized( { "View Patient Lists" })
	public PatientList getPatientListByUuid(String uuid);
	
	/**
	 * Gets PatientLists by EncounterType
	 *
	 * @param encounterType
	 * @return list of PatientLists
	 */
	@Authorized(value = { "View Patient Lists", PrivilegeConstants.VIEW_ENCOUNTER_TYPES }, requireAll = true)
	public List getPatientListByEncounterType(EncounterType encounterType);
	
	/**
	 * Gets all patients in PatientList
	 *
	 * @param patientList
	 * @return list of Patients
	 */
	@Authorized(value = { "View Patient Lists", PrivilegeConstants.VIEW_PATIENTS }, requireAll = true)
	public List getPatientsInList(PatientList patientList);
	
	/**
	 * Gets all the encounters in PatientList
	 * 
	 * @param patientList
	 * @return list of Encounters
	 */
	@Authorized(value = { "View Patient Lists", PrivilegeConstants.VIEW_ENCOUNTERS }, requireAll = true)
	public List getEncountersInPatientList(PatientList patientList);
	
	/**
	 * Updates PatientList
	 *
	 * @param patientList
	 * @return PatientList
	PatientList updatePatientList(PatientList patientList);
	
	/**
	 * Deletes PatientList
	 *
	 * @param patientList
	 */
	@Authorized( { "Delete Patient Lists" })
	public void deletePatientList(PatientList patientList);
}
File
PatientListService.java
Developer's decision
Version 1
Kind of conflict
Annotation
Comment
Import
Interface signature
Method interface