diff --git a/communityHallDocuments/hallImages/functionhall2.jpg b/communityHallDocuments/hallImages/functionhall2.jpg new file mode 100644 index 0000000..cc7f413 Binary files /dev/null and b/communityHallDocuments/hallImages/functionhall2.jpg differ diff --git a/communityHallDocuments/hallImages/functionhall4.jpg b/communityHallDocuments/hallImages/functionhall4.jpg new file mode 100644 index 0000000..5425124 Binary files /dev/null and b/communityHallDocuments/hallImages/functionhall4.jpg differ diff --git a/src/main/java/com/gcc/communityHall/configuration/WebConfig.java b/src/main/java/com/gcc/communityHall/configuration/WebConfig.java index 818847f..8ff6cb8 100644 --- a/src/main/java/com/gcc/communityHall/configuration/WebConfig.java +++ b/src/main/java/com/gcc/communityHall/configuration/WebConfig.java @@ -22,6 +22,8 @@ public class WebConfig implements WebMvcConfigurer { @Autowired private ReasonMasterRepository reasonMasterRepository; + public ResourceHandlerRegistry registryHandler; + @Autowired public WebConfig( @Value("${file.upload.directory}") String uploadDirectory, @@ -47,7 +49,7 @@ public class WebConfig implements WebMvcConfigurer { File f = new File(uploadDirectory); File imgDir = new File(hallImageUploadDirectory); List reasonMasters =reasonMasterRepository.findAll(); - + registryHandler=registry; if(!f.exists()) { f.mkdirs(); if(!imgDir.exists()){ diff --git a/src/main/java/com/gcc/communityHall/controller/TestController.java b/src/main/java/com/gcc/communityHall/controller/TestController.java index 33c47f0..fd205ff 100644 --- a/src/main/java/com/gcc/communityHall/controller/TestController.java +++ b/src/main/java/com/gcc/communityHall/controller/TestController.java @@ -1,5 +1,6 @@ package com.gcc.communityHall.controller; +import com.gcc.communityHall.dto.saveEbDetailsAndDamage; import com.gcc.communityHall.entity.*; import com.gcc.communityHall.others.UserSession; import com.gcc.communityHall.service.Impl.BookingServiceImpl; @@ -180,6 +181,15 @@ public ResponseEntity saveTheBookingDetails(HttpServletRequest request) { return ResponseEntity.ok(bookingService.confirmBooking(bookingId)); } + @PostMapping(path = "/processEbDetailsAndDamage") + public ResponseEntity processEbDetailsAndDamage(@RequestBody saveEbDetailsAndDamage ebAndDam) { + System.out.println("checking"); +// MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request; +// Map ebDetailsAndDamage = splitFormData(multipartRequest); +// System.out.println(ebDetailsAndDamage.size()); + return ResponseEntity.ok(""); + } + public Map splitFormData(MultipartHttpServletRequest multipartRequest){ Map formData = new HashMap<>(); diff --git a/src/main/java/com/gcc/communityHall/dto/DamageDTO.java b/src/main/java/com/gcc/communityHall/dto/DamageDTO.java new file mode 100644 index 0000000..f20de80 --- /dev/null +++ b/src/main/java/com/gcc/communityHall/dto/DamageDTO.java @@ -0,0 +1,52 @@ +package com.gcc.communityHall.dto; + +import org.springframework.web.multipart.MultipartFile; + +public class DamageDTO { + + private String assetName; + private String comments; + private MultipartFile assetImage; + private int quantity; + private float assetAmount; + + public String getAssetName() { + return assetName; + } + + public void setAssetName(String assetName) { + this.assetName = assetName; + } + + public String getComments() { + return comments; + } + + public void setComments(String comments) { + this.comments = comments; + } + + public MultipartFile getAssetImage() { + return assetImage; + } + + public void setAssetImage(MultipartFile assetImage) { + this.assetImage = assetImage; + } + + public int getQuantity() { + return quantity; + } + + public void setQuantity(int quantity) { + this.quantity = quantity; + } + + public float getAssetAmount() { + return assetAmount; + } + + public void setAssetAmount(float assetAmount) { + this.assetAmount = assetAmount; + } +} diff --git a/src/main/java/com/gcc/communityHall/dto/saveEbDetailsAndDamage.java b/src/main/java/com/gcc/communityHall/dto/saveEbDetailsAndDamage.java new file mode 100644 index 0000000..6e3e336 --- /dev/null +++ b/src/main/java/com/gcc/communityHall/dto/saveEbDetailsAndDamage.java @@ -0,0 +1,37 @@ +package com.gcc.communityHall.dto; + +import com.gcc.communityHall.entity.EbDetails; + +import java.util.List; + +public class saveEbDetailsAndDamage { + + private int bookingId; + private EbDetails ebDetails; + + private List damage; + + public int getBookingId() { + return bookingId; + } + + public void setBookingId(int bookingId) { + this.bookingId = bookingId; + } + + public EbDetails getEbDetails() { + return ebDetails; + } + + public void setEbDetails(EbDetails ebDetails) { + this.ebDetails = ebDetails; + } + + public List getDamage() { + return damage; + } + + public void setDamage(List damage) { + this.damage = damage; + } +} diff --git a/src/main/java/com/gcc/communityHall/service/Impl/ReasonMasterImpl.java b/src/main/java/com/gcc/communityHall/service/Impl/ReasonMasterImpl.java index d3a9d18..d16cb39 100644 --- a/src/main/java/com/gcc/communityHall/service/Impl/ReasonMasterImpl.java +++ b/src/main/java/com/gcc/communityHall/service/Impl/ReasonMasterImpl.java @@ -1,12 +1,15 @@ package com.gcc.communityHall.service.Impl; +import com.gcc.communityHall.configuration.WebConfig; import com.gcc.communityHall.entity.ReasonDocumentMaster; import com.gcc.communityHall.entity.ReasonMaster; import com.gcc.communityHall.repository.ReasonDocMasterRepository; import com.gcc.communityHall.repository.ReasonMasterRepository; import com.gcc.communityHall.service.ReasonMasterService; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.ApplicationContext; import org.springframework.stereotype.Service; +import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; import java.util.List; @@ -19,11 +22,23 @@ public class ReasonMasterImpl implements ReasonMasterService { @Autowired ReasonDocMasterRepository reasonDocMasterRepository; + @Autowired + private ApplicationContext applicationContext; + + + + @Autowired + private WebConfig webConfig; + + @Override public String saveTheReason(ReasonMaster reasonMaster) { List reasonDocumentMasterList =reasonMaster.getReasonDocumentMasterList(); reasonMaster.setReasonDocumentMasterList(null); ReasonMaster resMaster =reasonMasterRepository.save(reasonMaster); + + webConfig.addResourceHandlers(webConfig.registryHandler); + if(reasonDocumentMasterList!=null) { for (int i = 0; i < reasonDocumentMasterList.size(); i++) { ReasonDocumentMaster reasonDocMaster = reasonDocumentMasterList.get(i);