Subversion Repositories SmartDukaan

Rev

Rev 24056 | Rev 24063 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 24056 Rev 24057
Line 130... Line 130...
130
 
130
 
131
		List<TagListing> tagListings = tagListingRepository.selectAll(false);
131
		List<TagListing> tagListings = tagListingRepository.selectAll(false);
132
		Map<Integer, TagListing> tagListingMap = new HashMap<>();
132
		Map<Integer, TagListing> tagListingMap = new HashMap<>();
133
		List<ItemDescriptionModel> customItems = new ArrayList<>();
133
		List<ItemDescriptionModel> customItems = new ArrayList<>();
134
		List<ItemDescriptionModel> newCustomItems = new ArrayList<>();
134
		List<ItemDescriptionModel> newCustomItems = new ArrayList<>();
135
		List<Item> items = itemRepository.selectRecentItems(50);
135
		List<Item> items = itemRepository.selectRecentItems(100);
136
		
-
 
137
		for(Item item: items) {
136
		for(Item item: items) {
138
			ItemDescriptionModel itemDescriptionModel = new ItemDescriptionModel();
137
			ItemDescriptionModel itemDescriptionModel = new ItemDescriptionModel();
139
			itemDescriptionModel.setItemId(item.getId());
138
			itemDescriptionModel.setItemId(item.getId());
140
			itemDescriptionModel.setItemDescription(item.getItemDescription() + "(" + item.getId() + ")");
139
			itemDescriptionModel.setItemDescription(item.getItemDescription() + "(" + item.getId() + ")");
141
			newCustomItems.add(itemDescriptionModel);
140
			newCustomItems.add(itemDescriptionModel);
Line 151... Line 150...
151
			itemDescriptionModel
150
			itemDescriptionModel
152
					.setItemDescription(tagListing.getItemDescription() + "(" + tagListing.getItemId() + ")");
151
					.setItemDescription(tagListing.getItemDescription() + "(" + tagListing.getItemId() + ")");
153
			customItems.add(itemDescriptionModel);
152
			customItems.add(itemDescriptionModel);
154
			catalogDescription.put(item.getCatalogItemId(), item.getItemDescriptionNoColor());
153
			catalogDescription.put(item.getCatalogItemId(), item.getItemDescriptionNoColor());
155
		}
154
		}
-
 
155
		
-
 
156
		newCustomItems.removeAll(customItems);
156
 
157
 
157
		List<PriceDrop> priceDrops = priceDropRepository.selectAll();
158
		List<PriceDrop> priceDrops = priceDropRepository.selectAll();
158
		model.addAttribute("tagListingMap", tagListingMap);
159
		model.addAttribute("tagListingMap", tagListingMap);
159
		model.addAttribute("customItems", new JSONArray(customItems).toString());
160
		model.addAttribute("customItems", new JSONArray(customItems).toString());
160
		model.addAttribute("newCustomItems", new JSONArray(newCustomItems).toString());
161
		model.addAttribute("newCustomItems", new JSONArray(newCustomItems).toString());