Subversion Repositories SmartDukaan

Rev

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

Rev 2424 Rev 2607
Line 168... Line 168...
168 
			long entityID =  catalogServiceClient.getClient().generateNewEntityID();
 168 
			long entityID =  catalogServiceClient.getClient().generateNewEntityID();
169
169
170 
			String categoryID = this.reqparams.get("category")[0];
 170 
			String categoryID = this.reqparams.get("category")[0];
171 
			Entity entity = new Entity(entityID, Long.parseLong(categoryID));
 171 
			Entity entity = new Entity(entityID, Long.parseLong(categoryID));
172 
 
 172 
 
173 
			entity.setBrand(this.reqparams.get("brand")[0]);
 173 
			entity.setBrand((this.reqparams.get("brand")[0]).trim());
174 
			entity.setModelName(this.reqparams.get("modelname")[0]);
 174 
			entity.setModelName((this.reqparams.get("modelname")[0]).trim());
175 
			entity.setModelNumber(this.reqparams.get("modelnumber")[0]);
 175 
			entity.setModelNumber((this.reqparams.get("modelnumber")[0]).trim());
176
176
177 
			EntityState entityState = new EntityState(entityID, Long.parseLong(categoryID), getUsername());
 177 
			EntityState entityState = new EntityState(entityID, Long.parseLong(categoryID), getUsername());
178 
			entity.setBrand(this.reqparams.get("brand")[0]);
 178 
			entityState.setBrand((this.reqparams.get("brand")[0]).trim());
179 
			entity.setModelName(this.reqparams.get("modelname")[0]);
 179 
			entityState.setModelName((this.reqparams.get("modelname")[0]).trim());
180 
			entity.setModelNumber(this.reqparams.get("modelnumber")[0]);
 180 
			entityState.setModelNumber((this.reqparams.get("modelnumber")[0]).trim());
181 
 
 181
182
182
183 
			CreationUtils.createEntity(entity, entityState);
 183 
			CreationUtils.createEntity(entity, entityState);
184
184
185 
	    	this.setId(new Long(entityID).toString());
 185 
	    	this.setId(new Long(entityID).toString());
186 
		} catch (Exception e) {
 186 
		} catch (Exception e) {
Line 319... Line 319...
319 
			return "success";
 319 
			return "success";
320 
		}
 320 
		}
321
321
322 
    	try {
 322 
    	try {
323 
			this.expEntity = this.getExpandedEntity(entityID);
 323 
			this.expEntity = this.getExpandedEntity(entityID);
324 
			//log.info("this.expEntity:" + this.expEntity);
 - 
 
325 
			log.info("p0");
 - 
 
326 
 
 324
327 
			// Save and Go to slides selection page
 325 
			// Save and Go to slides selection page
328 
			if (this.reqparams.containsKey("slides")) {
 326 
			if (this.reqparams.containsKey("slides")) {
329 
				log.info("p1");
 - 
 
330
327
331 
				Entity entity = this.expEntity.getEntity();
 328 
				Entity entity = this.expEntity.getEntity();
332 
				log.info("p2");
 - 
 
333
329
334 
				String categoryID = this.reqparams.get("category")[0];
 330 
				String categoryID = this.reqparams.get("category")[0];
335
331
336 
				entity.setCategoryID(Long.parseLong(categoryID));
 332 
				entity.setCategoryID(Long.parseLong(categoryID));
337 
				entity.setBrand(this.reqparams.get("brand")[0]);
 - 
 
338 
				entity.setModelName(this.reqparams.get("modelname")[0]);
 - 
 
339 
				entity.setModelNumber(this.reqparams.get("modelnumber")[0]);
 - 
 
340
333
- 
 
 334 
				entity.setBrand((this.reqparams.get("brand")[0]).trim());
341 
				EntityState entityState = CreationUtils.getEntityState(entity.getID());
 335 
				entity.setModelName((this.reqparams.get("modelname")[0]).trim());
- 
 
 336 
				entity.setModelNumber((this.reqparams.get("modelnumber")[0]).trim());
342
337
- 
 
 338 
				EntityState entityState = CreationUtils.getEntityState(entity.getID());
343 
				entityState.setCategoryID(Long.parseLong(categoryID));
 339 
				entityState.setCategoryID(Long.parseLong(categoryID));
344 
				entityState.setBrand(this.reqparams.get("brand")[0]);
 340 
				entityState.setBrand((this.reqparams.get("brand")[0]).trim());
345 
				entityState.setModelName(this.reqparams.get("modelname")[0]);
 341 
				entityState.setModelName((this.reqparams.get("modelname")[0]).trim());
346 
				entityState.setModelNumber(this.reqparams.get("modelnumber")[0]);
 342 
				entityState.setModelNumber((this.reqparams.get("modelnumber")[0]).trim());
347
343
348 
				log.info("p3");
 - 
 
349 
				CreationUtils.updateEntity(entity);
 344 
				CreationUtils.updateEntity(entity);
350 
				CreationUtils.updateEntityState(entityState);
 345 
				CreationUtils.updateEntityState(entityState);
351 
				//this.updateEntity(entity);
 - 
 
352
346
353 
				this.redirectURL = "/slides/" + this.getId() + "/edit";
 347 
				this.redirectURL = "/slides/" + this.getId() + "/edit";
354 
				return "redirect";
 348 
				return "redirect";
355 
			}
 349 
			}
356
350
Line 423... Line 417...
423 
				Entity entity = this.expEntity.getEntity();
 417 
				Entity entity = this.expEntity.getEntity();
424 
 
 418 
 
425 
				String categoryID = this.reqparams.get("category")[0];
 419 
				String categoryID = this.reqparams.get("category")[0];
426
420
427 
				entity.setCategoryID(Long.parseLong(categoryID));
 421 
				entity.setCategoryID(Long.parseLong(categoryID));
428 
				entity.setBrand(this.reqparams.get("brand")[0]);
 422 
				entity.setBrand((this.reqparams.get("brand")[0]).trim());
429 
				entity.setModelName(this.reqparams.get("modelname")[0]);
 423 
				entity.setModelName((this.reqparams.get("modelname")[0]).trim());
430 
				entity.setModelNumber(this.reqparams.get("modelnumber")[0]);
 424 
				entity.setModelNumber((this.reqparams.get("modelnumber")[0]).trim());
431
425
432 
				CreationUtils.updateEntity(entity);
 426 
				CreationUtils.updateEntity(entity);
433
427
434 
				return "success";
 428 
				return "success";
435 
			}
 429 
			}
Line 439... Line 433...
439 
			if(slideIDs == null) {
 433 
			if(slideIDs == null) {
440 
				this.setErrorString("Slides need to be picked first!");
 434 
				this.setErrorString("Slides need to be picked first!");
441 
				return "fatal";
 435 
				return "fatal";
442 
			}
 436 
			}
443
437
444 
			log.info("p4");
 - 
 
445
438
446 
			boolean skip = false;
 439 
			boolean skip = false;
447 
			if(this.reqparams.containsKey("skipprev") ||
440 
			if(this.reqparams.containsKey("skipprev") ||
448 
					this.reqparams.containsKey("skipnext")) {
 441 
					this.reqparams.containsKey("skipnext")) {
449 
				skip = true;
 442 
				skip = true;
Line 460... Line 453...
460 
			// Save or Next or Prev or Go - When editing a slide
 453 
			// Save or Next or Prev or Go - When editing a slide
461 
			int currentSlideIndex = 0;
 454 
			int currentSlideIndex = 0;
462 
			currentSlideIndex = slideIDs.indexOf(new Long(currentSlideDefID));
 455 
			currentSlideIndex = slideIDs.indexOf(new Long(currentSlideDefID));
463 
			log.info("currentSlideIndex:" + currentSlideIndex);
 456 
			log.info("currentSlideIndex:" + currentSlideIndex);
464 
 
 457 
 
465 
			log.info("p5");
 - 
 
466 
			if(!skip && currentSlideDefID != 0L) {
 458 
			if(!skip && currentSlideDefID != 0L) {
467 
				Entity entity = this.expEntity.getEntity();
 459 
				Entity entity = this.expEntity.getEntity();
468
- 
 
469 
				log.info("p6");
 - 
 
470 
				// Create new instance and override existing
 460 
				// Create new instance and override existing
471 
				Slide currentSlide = this.createSlide(currentSlideDefID);
 461 
				Slide currentSlide = this.createSlide(currentSlideDefID);
472
- 
 
473 
				entity.addSlide(currentSlide);
 462 
				entity.addSlide(currentSlide);
474 
				long categoryID = this.getEntity().getCategoryID();
 - 
 
475 
				//List<Long> orderedSlideIDs = CreationUtils.getSlideSequence(entityID, categoryID);
 - 
 
476
- 
 
477 
				List<Long> orderedSlideIDs = entity.getSlideSequence();
 - 
 
478
- 
 
479 
				if(orderedSlideIDs != null) {
 - 
 
480 
					//entity.reorderSlides(orderedSlideIDs);
 - 
 
481 
				}
 - 
 
482 
				log.info("p7");
 - 
 
483 
				// Store
 - 
 
484 
				CreationUtils.updateEntity(entity);
 463 
				CreationUtils.updateEntity(entity);
485 
				//log.info("entity:" + entity);
 - 
 
486 
			}
 464 
			}
487
465
488 
			// Skip will delete current slide from entity
 466 
			// Skip will delete current slide from entity
489 
			else if(skip && currentSlideDefID != 0L) {
 467 
			else if(skip && currentSlideDefID != 0L) {
490 
				Entity entity = this.expEntity.getEntity();
 468 
				Entity entity = this.expEntity.getEntity();
491 
				entity.removeSlide(currentSlideDefID);
 469 
				entity.removeSlide(currentSlideDefID);
492 
				long categoryID = this.getEntity().getCategoryID();
 - 
 
493 
				//List<Long> orderedSlideIDs = CreationUtils.getSlideSequence(entityID, categoryID);
 - 
 
494
- 
 
495 
				log.info("p8");
 - 
 
496
- 
 
497 
				List<Long> orderedSlideIDs = entity.getSlideSequence();
 - 
 
498 
				if(orderedSlideIDs != null) {
 - 
 
499 
					//entity.reorderSlides(orderedSlideIDs);
 - 
 
500 
				}
 - 
 
501
- 
 
502 
				// Store
 470 
				// Store
503 
				CreationUtils.updateEntity(entity);
 471 
				CreationUtils.updateEntity(entity);
504 
				//log.info("entity:" + entity);
 - 
 
505
- 
 
506 
				log.info("p9");
 - 
 
507 
			}
 472 
			}
508
473
509 
			boolean showAnotherSlide = false;
 474 
			boolean showAnotherSlide = false;
510
475
511 
			// -2 : Not set
 476 
			// -2 : Not set
512 
			// -1 : Not found
 477 
			// -1 : Not found
513 
			int newCurrentIndex = -2;
478 
			int newCurrentIndex = -2;
Line 1471... Line 1436...
1471 
	 * @return
 1436 
	 * @return
1472 
	 */
 1437 
	 */
1473 
	public List<String[]> getSlides() {
 1438 
	public List<String[]> getSlides() {
1474 
		try {
 1439 
		try {
1475 
			long entityID = Long.parseLong(this.getId());
 1440 
			long entityID = Long.parseLong(this.getId());
1476 
			long categoryID = this.getEntity().getCategoryID();
 - 
 
1477 
			//List<Long> slideDefIDs = CreationUtils.getSlideSequence(entityID, categoryID);
 - 
 
1478 
			List<Long> slideDefIDs = CreationUtils.getEntity(entityID).getSlideSequence();
 1441 
			List<Long> slideDefIDs = CreationUtils.getEntity(entityID).getSlideSequence();
1479
1442
1480 
			List<String[]> slideData = new ArrayList<String[]>();
 1443 
			List<String[]> slideData = new ArrayList<String[]>();
1481
1444
1482 
			for(Long slideDefID : slideDefIDs) {
 1445 
			for(Long slideDefID : slideDefIDs) {