Skip to content

Commit

Permalink
Merge pull request #768 from NSSuresh11/OLE-6393_3.0_New
Browse files Browse the repository at this point in the history 
OLE-6393 : Fixed testing issues found in dev server (OLE-6393 and OLE-8906) for OLE-3.0
  • Loading branch information
@peris
peris committed Jun 3, 2016
2 parents a371764 + 7528e6e commit c6054b3
Show file tree
Hide file tree
Showing 4 changed files with 172 additions and 0 deletions.
4 changes: 4 additions & 0 deletions ole-app/olefs/src/main/java/org/kuali/ole/deliver/controller/CircBaseController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,10 @@ public void showErrorMessageDialog(UifFormBase form, HttpServletRequest request,
showDialog("ptrnValidationErrorMessageDialog", form, request, response);
}

public void showHoldErrorMessageDialog(UifFormBase form, HttpServletRequest request, HttpServletResponse response) {
showDialog("holdValidationErrorMessageDialog", form, request, response);
}

@RequestMapping(params = "methodToCall=clearSession")
public ModelAndView clearSession(@ModelAttribute("KualiForm") UifFormBase form, BindingResult result,
HttpServletRequest request, HttpServletResponse response) throws Exception {
Expand Down
103 changes: 103 additions & 0 deletions ...efs/src/main/java/org/kuali/ole/deliver/controller/checkout/CheckoutPatronController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import org.apache.commons.lang3.StringUtils;
import org.apache.log4j.Logger;
import org.jfree.util.Log;
import org.kuali.ole.OLEConstants;
import org.kuali.ole.deliver.bo.OlePatronDocument;
import org.kuali.ole.deliver.bo.OlePatronNotes;
import org.kuali.ole.deliver.bo.OleProxyPatronDocument;
Expand All @@ -13,6 +14,7 @@
import org.kuali.ole.deliver.form.CircForm;
import org.kuali.ole.deliver.util.DroolsResponse;
import org.kuali.ole.deliver.util.OlePatronRecordUtil;
import org.kuali.ole.docstore.engine.service.storage.rdbms.pojo.ItemRecord;
import org.kuali.ole.utility.OleStopWatch;
import org.kuali.rice.krad.service.KRADServiceLocator;
import org.kuali.rice.krad.util.GlobalVariables;
Expand All @@ -22,12 +24,21 @@
import org.springframework.web.bind.annotation.ModelAttribute;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.servlet.ModelAndView;
import org.kuali.ole.deliver.bo.OleDeliverRequestBo;
import org.kuali.ole.deliver.bo.OleCirculationDeskLocation;
import org.kuali.ole.deliver.bo.OleCirculationDesk;
import org.kuali.ole.deliver.service.OleLoanDocumentDaoOjb;
import org.kuali.ole.deliver.util.ErrorMessage;
import org.kuali.ole.sys.context.SpringContext;

import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.Collection;
import java.util.Map;
import java.util.HashMap;

/**
* Created by hemalathas on 6/21/15.
Expand All @@ -39,6 +50,8 @@ public class CheckoutPatronController extends CheckoutItemController {
private static final Logger LOG = Logger.getLogger(CheckoutPatronController.class);
private PatronLookupCircUIController patronLookupCircUIController;
private OlePatronRecordUtil olePatronRecordUtil;
private OleLoanDocumentDaoOjb oleLoanDocumentDaoOjb;
private ErrorMessage errorMessage;

@RequestMapping(params = "methodToCall=searchPatron")
public ModelAndView searchPatron(@ModelAttribute("KualiForm") UifFormBase form, BindingResult result,
Expand Down Expand Up @@ -91,11 +104,13 @@ public ModelAndView handleProxyPatronsIfExists(@ModelAttribute("KualiForm") UifF
droolsExchange.addToContext("circForm", circForm);
boolean proxyPatrons = getPatronLookupCircUIController().hasProxyPatrons(droolsExchange);
if (!proxyPatrons) {
setProceedWithCheckoutFlag(circForm);
circForm.setProxyCheckDone(true);
} else {
String overrideParameters = "{closeBtn:false,autoSize : false}";
showDialogWithOverrideParameters("proxyListCheckoutDialog", circForm,overrideParameters);
}

if(circForm.isProxyCheckDone()) {
DroolsResponse droolsResponse = getPatronLookupCircUIController().processPatronValidation(droolsExchange);
if (null != droolsResponse && StringUtils.isNotBlank(droolsResponse.retrieveErrorMessage())) {
Expand All @@ -105,6 +120,9 @@ public ModelAndView handleProxyPatronsIfExists(@ModelAttribute("KualiForm") UifF
postPatronValidation(circForm, result, request, response);
}
}
if(circForm.isProxyCheckDone() && (searchHold(circForm))) {
showHoldErrorMessageDialog(circForm, request, response);
}
if(StringUtils.isBlank(circForm.getLightboxScript())){
circForm.setLightboxScript("jq('#checkoutItem_control').focus();");
} else {
Expand Down Expand Up @@ -271,4 +289,89 @@ public OlePatronRecordUtil getOlePatronRecordUtil() {
public void setOlePatronRecordUtil(OlePatronRecordUtil olePatronRecordUtil) {
this.olePatronRecordUtil = olePatronRecordUtil;
}

public boolean searchHold(CircForm circForm
) throws Exception {
OleCirculationDesk oleCirculationDesk = getCircDeskLocationResolver().getOleCirculationDesk(circForm.getSelectedCirculationDesk());
OlePatronDocument olePatronDocument = circForm.getPatronDocument();
List<OleDeliverRequestBo> oleDeliverRequestBoList = olePatronDocument.getOleDeliverRequestBos();
errorMessage = new ErrorMessage();
int holdSameLocCount = 0;
int holdOtherLocCount = 0;
if(oleDeliverRequestBoList != null && oleDeliverRequestBoList.size()>0) {
for(OleDeliverRequestBo deliverRequestBo : oleDeliverRequestBoList) {
if (deliverRequestBo.getRequestTypeCode() != null && deliverRequestBo.getRequestTypeCode().contains("Hold")) {
Map itemIdMap = new HashMap();
itemIdMap.put(OLEConstants.ITEM_ID, deliverRequestBo.getItemUuid().substring(4));
ItemRecord itemRecord = KRADServiceLocator.getBusinessObjectService().findByPrimaryKey(ItemRecord.class, itemIdMap);
if(itemRecord.getItemStatusRecord().getCode().equalsIgnoreCase(OLEConstants.ITEM_STATUS_ON_HOLD)) {
if (StringUtils.isNotBlank(oleCirculationDesk.getShowItemOnHold()) && oleCirculationDesk.getShowItemOnHold().equals(OLEConstants.CURR_CIR_DESK) && oleCirculationDesk.getOlePickupCirculationDeskLocations() != null){
Collection<Object> oleCirculationDeskLocations = getOleLoanDocumentDaoOjb().getPickUpLocationForCirculationDesk(oleCirculationDesk);
if(isPickupCirculationLocationMatched(oleCirculationDeskLocations,deliverRequestBo)) {
deliverRequestBo.setOnHoldRequestForPatronMessage(OLEConstants.PTRN_RQST_MSG_CURR_CIR_DESK);
holdSameLocCount = holdSameLocCount + 1;
}
}else if (StringUtils.isNotBlank(oleCirculationDesk.getShowItemOnHold()) && oleCirculationDesk.getShowItemOnHold().equals(OLEConstants.ALL_CIR_DESK)) {
deliverRequestBo.setOnHoldRequestForPatronMessage(OLEConstants.PTRN_RQST_MSG_ALL_CIR_DESK);
holdOtherLocCount = holdOtherLocCount + 1;

}
}
}
}
if(holdSameLocCount > 0) {
errorMessage.setErrorMessage(OLEConstants.PTRN_RQST_MSG_CURR_CIR_DESK);
circForm.setErrorMessage(errorMessage);
}
if(holdOtherLocCount > 0) {
errorMessage.setErrorMessage(OLEConstants.PTRN_RQST_MSG_ALL_CIR_DESK);
circForm.setErrorMessage(errorMessage);
}
}
if(holdSameLocCount > 0 || holdOtherLocCount > 0) {
return true;
}
return false;
}

@RequestMapping(params = "methodToCall=postRequestCheck")
public ModelAndView postRequestCheck(@ModelAttribute("KualiForm") UifFormBase form, BindingResult result,
HttpServletRequest request, HttpServletResponse response) throws Exception {
CircForm circForm = (CircForm) form;
if (checkForPatronUserNotes(circForm.getDroolsExchange())) {
showDialog("patronUserNotesDialog", circForm, request, response);
}
if (circForm.isAutoCheckout()) {
return lookupItemAndSaveLoan(circForm, result, request, response);
}
circForm.setLightboxScript("jq('#checkoutItem_control').focus();");
return getUIFModelAndView(circForm);
}

public OleLoanDocumentDaoOjb getOleLoanDocumentDaoOjb() {
if(oleLoanDocumentDaoOjb == null){
oleLoanDocumentDaoOjb = (OleLoanDocumentDaoOjb) SpringContext.getBean("oleLoanDao");
}
return oleLoanDocumentDaoOjb;
}

public void setOleLoanDocumentDaoOjb(OleLoanDocumentDaoOjb oleLoanDocumentDaoOjb) {
this.oleLoanDocumentDaoOjb = oleLoanDocumentDaoOjb;
}

public boolean isPickupCirculationLocationMatched(Collection<Object> pickUpLocation,OleDeliverRequestBo deliverRequestBo) {

for (Object oleCirculationDeskLoc : pickUpLocation){
if(deliverRequestBo.getPickUpLocationCode() != null) {
OleCirculationDeskLocation oleCirculationDeskLocation = (OleCirculationDeskLocation)oleCirculationDeskLoc;
if (StringUtils.isNotBlank(oleCirculationDeskLocation.getCirculationPickUpDeskLocation()) &&
oleCirculationDeskLocation.getOleCirculationDesk() !=null &&
oleCirculationDeskLocation.getOleCirculationDesk().getCirculationDeskCode()!= null &&
oleCirculationDeskLocation.getOleCirculationDesk().getCirculationDeskCode().contains(deliverRequestBo.getPickUpLocationCode())) {
return true;
}
}
}
return false;
}
}
1 change: 1 addition & 0 deletions ole-app/olefs/src/main/resources/org/kuali/ole/deliver/view/circulations/circ-view.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
<list>
<bean id="circDeskChangeDialog" parent="cirDeskChangeConfirmationDialog"/>
<bean id="ptrnValidationErrorMessageDialog" parent="patronValidationErrorMessageDialog"/>
<bean id="holdValidationErrorMessageDialog" parent="itemHoldValidationErrorMessageDialog"/>
<bean id="overrideMessageDialog" parent="operatorOverrideMessageDialog"/>
<bean id="proxyListCheckoutDialog" parent="proxyForPatronListDialog"/>
<bean id="customDueDateDialog" parent="customDueDateConfirmationDialog"/>
Expand Down
64 changes: 64 additions & 0 deletions ...ces/org/kuali/ole/deliver/view/circulations/dialogs/item-hold-validation-error-dialog.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright 2005-2012 The Kuali Foundation
Licensed under the Educational Community 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.opensource.org/licenses/ecl2.php
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.
-->

<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-3.1.xsd">


<!--OleGenericDialogs-->
<bean id="itemHoldValidationErrorMessageDialog" parent="errorMessageDialog">
<property name="availableResponses">
<list>
<!--Empty-->
</list>
</property>
<property name="items">
<list merge="true">
<ref bean="itemHoldValidationErrorBtnLayoutSection"/>
</list>
</property>
</bean>

<bean id="itemHoldValidationErrorBtnLayoutSection" parent="Uif-HorizontalBoxSection">
<property name="items">
<list>
<bean id="proceed_Button" parent="Uif-SecondaryActionButton" p:actionLabel="Proceed" p:style="width:150px"
p:methodToCall="postRequestCheck" p:ajaxSubmit="true"
p:onClickScript="jq.fancybox.close();"
p:successCallback="jq('#checkoutItem_control').focus();"/>
<bean id="donNotProceedButton" parent="Uif-SecondaryActionButton" p:actionLabel="Do Not Procced"
p:style="width:300px"
p:methodToCall="clearUI" p:ajaxSubmit="true" p:onClickScript="jq.fancybox.close();"/>
<bean id="holdRecordLink" parent="Uif-LinkField" p:target="_blank"
p:style="height:25px;font-size:12px;line-height:2em;"
p:href="@{urlBase}/portal.do?channelTitle=Patron&amp;channelUrl=@{urlBase}/ole-kr-krad/patronRequestedRecord?viewId=OlePatronRequestedRecordView&amp;methodToCall=viewRequestedRecords&amp;patronId=@{patronDocument.olePatronId}"
p:linkText="&lt;font color='#000000'/&gt;View Hold Items&lt;/font&gt;" >
<property name="cssClasses">
<list merge="true">
<value>uif-smallActionButton</value>
</list>
</property>
</bean>
</list>
</property>
</bean>

</beans>

0 comments on commit c6054b3

Please sign in to comment.