Skip to content

Commit 3181c8f

Browse files
nechromancernechromancer
committed
Find a Car module has been added.
1 parent e77a114 commit 3181c8f

File tree

7 files changed

+66
-12
lines changed

7 files changed

+66
-12
lines changed

‎JavaSource/com/acminds/acuteauto/persistence/dto/Vehicle.java‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import javax.faces.bean.ManagedBean;
1616

1717
import com.acminds.acuteauto.persistence.entities.AbstractVehicle;
18+
import com.acminds.acuteauto.utils.Utils;
1819
import com.acminds.acuteauto.utils.EnumConstants.ImageType;
1920

2021
@ManagedBean(name = "vehicle")
@@ -30,14 +31,19 @@ public Image getBannerImage() {
3031
}
3132
return null;
3233
}
34+
35+
private Image displayImage;
3336
@Transient
3437
public Image getDisplayImage() {
35-
for(Image im: getImages()) {
36-
if(im.getImageType() == ImageType.PRIMARY)
37-
return im;
38+
if(displayImage == null) {
39+
for(Image im: getImages()) {
40+
if(!Utils.isEmpty(im.getImageType()) && im.getImageType() == ImageType.PRIMARY)
41+
displayImage = im;
42+
}
3843
}
39-
return null;
44+
return displayImage;
4045
}
46+
4147
private List<FeatureGroup> distinctGroups;
4248
@Transient
4349
public List<FeatureGroup> getDistinctGroups() {

‎JavaSource/com/acminds/acuteauto/persistence/entities/AbstractInquiry.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ public void setNotes(String notes) {
127127
}
128128

129129
@Temporal(TemporalType.TIMESTAMP)
130-
@Column(name = "CREATE_DATE", nullable = false, length = 19)
130+
@Column(name = "CREATE_DATE", nullable = false, insertable=false, updatable=false, length = 19)
131131
public Date getCreateDate() {
132132
return this.createDate;
133133
}

‎JavaSource/com/acminds/acuteauto/persistence/entities/AbstractVehicle.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,7 @@ public void setAdvertisements(List<Advertisement> advertisements) {
346346
this.advertisements = advertisements;
347347
}
348348

349-
@OneToMany(fetch = FetchType.LAZY, mappedBy = "vehicle")
349+
@OneToMany(fetch = FetchType.EAGER, mappedBy = "vehicle")
350350
public List<Image> getImages() {
351351
return this.images;
352352
}

‎JavaSource/com/acminds/acuteauto/ui/controller/InquiryController.java‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
/**
2+
*
3+
*/
4+
package com.acminds.acuteauto.ui.controller;
5+
6+
import javax.annotation.PostConstruct;
7+
import javax.faces.application.FacesMessage;
8+
import javax.faces.bean.ManagedBean;
9+
import javax.faces.bean.ViewScoped;
10+
11+
import com.acminds.acuteauto.persistence.dto.FindVehicle;
12+
import com.acminds.acuteauto.persistence.dto.Inquiry;
13+
import com.acminds.acuteauto.persistence.dto.Model;
14+
import com.acminds.acuteauto.utils.WebUtils;
15+
16+
/**
17+
* @author Mansur
18+
*
19+
*/
20+
@ManagedBean(name="inqCtrl")
21+
@ViewScoped
22+
public class InquiryController extends InventoryController {
23+
private Inquiry inquiry;
24+
public Inquiry getInquiry() {
25+
return inquiry;
26+
}
27+
public void setInquiry(Inquiry inquiry) {
28+
this.inquiry = inquiry;
29+
}
30+
31+
@PostConstruct
32+
public void init() {
33+
inquiry = new Inquiry();
34+
FindVehicle fv = new FindVehicle();
35+
fv.setMileage(50000);
36+
fv.setInquiry(inquiry);
37+
inquiry.getFindVehicles().add(fv);
38+
}
39+
40+
public String submitInquiry() {
41+
FindVehicle fv = inquiry.getFindVehicles().get(0);
42+
fv.setModel(service.getBaseDao().get(Model.class, getModelId()));
43+
service.getBaseDao().save(inquiry, false);
44+
service.getBaseDao().saveAll(inquiry.getFindVehicles(), true);
45+
WebUtils.addMessage(FacesMessage.SEVERITY_INFO, "inqSuccess");
46+
return null;
47+
}
48+
}

‎JavaSource/com/acminds/acuteauto/ui/listener/DefaultRequestListener.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,17 +31,17 @@ public DefaultRequestListener() {
3131
*/
3232
@Override
3333
public void requestDestroyed(ServletRequestEvent arg0) {
34-
log.log(Level.INFO, "ServletRequest destroyed");
35-
((HttpServletRequest)arg0.getServletRequest()).getSession().setAttribute("EMHolder", PersistenceManager.getEntityManager());
34+
// log.log(Level.INFO, "ServletRequest destroyed");
35+
// ((HttpServletRequest)arg0.getServletRequest()).getSession().setAttribute("EMHolder", PersistenceManager.getEntityManager());
3636
}
3737

3838
/* (non-Javadoc)
3939
* @see javax.servlet.ServletRequestListener#requestInitialized(javax.servlet.ServletRequestEvent)
4040
*/
4141
@Override
4242
public void requestInitialized(ServletRequestEvent arg0) {
43-
EntityManager em = (EntityManager)((HttpServletRequest)arg0.getServletRequest()).getSession().getAttribute("EMHolder");
44-
if(em!=null) PersistenceManager.setEntityManager(em);
43+
EntityManager em = (EntityManager)((HttpServletRequest)arg0.getServletRequest()).getSession().getAttribute(PersistenceManager.EM_HOLDER);
44+
if(em!=null) PersistenceManager.setEntityManager(em);
4545
log.log(Level.FINE, "Servlet Request Initialized");
4646
}
4747

‎JavaSource/com/acminds/acuteauto/ui/listener/DefaultSessionListener.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ public class DefaultSessionListener implements HttpSessionListener {
2121
@Override
2222
public void sessionCreated(HttpSessionEvent arg0) {
2323
logger.info("Session created with SessionId: "+arg0.getSession().getId());
24+
arg0.getSession().setAttribute(PersistenceManager.EM_HOLDER, PersistenceManager.getEntityManager());
2425
}
2526

2627
@Override

‎JavaSource/resources.properties‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
prompt=Your Name\:
2-
greeting=Hello
1+
inqSuccess : Your inquiry has been submitted successfully. One of our representatives will get in touch with you shortly.

0 commit comments

Comments
 (0)