lmStyle.css - Changed the directory holding the file from images to css.
Image.java - Added 2 instance variables and enum PhotoPlanType and a Boolean hidden so we do not show photos that have not been approved or have been deleted.
Location.java - Removed the LocationPlanType enum which is no longer being used and added the PhotoPlanType enum.
FileUploadController.java - Added code to determine whether the photo being added is free or must be charged. Added new param for the next page so uploadImage method can be used by multiple callers from different jsp pages.
LocationProviderController.java - Added setting of the UserPlanType and the setting of number of free and paid photos to 0 when creating new Provider and new Location. When editing a location now call modifyLocation instead of modifyUser to get rid of extra sql calls.
LocationProvider.java - Removed LocationPlanType variable and added UserPlanType variable. Changed the cascade setting of the association collection providerLocations from All to delete-orphan.
PhotoPlanType.java - New enum to indicate which type of plan each image is a part of and what the location itself is. The values are FREE_PHOTO and PAID_PHOTO.
UserPlanType.java - Changed LocationPlanType enum to UserPlanType with the values BASIC and PREMIUM.
LocationProviderService.java - Added method addImage() instead of adding all of the images first and then calling modifyLocation which generates to many sql calls.
LocationProviderServiceImpl.java - Added method addImage() instead of adding all of the images first and then calling modifyLocation which generates to many sql calls.
LocationScoutServiceImpl.java - When adding a LocationRequest we save the request instead of calling update on the scout which generates too many sql calls.
GlobalVars.java - Added static variables for the total number of free photos based on whether it is a Basic User Plan or a Premium User Plan.
addPhoto.jsp - Added nextPage variable to pass to the FileUploadController.java
editAddPhoto.jsp - New page for adding photos to an existing Location.
editLocationListing.jsp - Changed the width of the table to 600px.
index.jsp - Changed the path of the style sheet to ./css/lmStyle.css from ./images/lmStyle.css.
provider.jsp - Changed the path of the style sheet to ./css/lmStyle.css from ./images/lmStyle.css.
scoutAlerts.jsp - Changed the path of the style sheet to ./css/lmStyle.css from ./images/lmStyle.css.
searchLocationRequest.jsp - Changed the path of the style sheet to ./css/lmStyle.css from ./images/lmStyle.css.
viewSubmissionsListings.jsp - Added checkbox for each submission to indicate whether they should be deleted or not