Subversion Repositories SmartDukaan

Rev

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

Rev 30487 Rev 30522
Line 36... Line 36...
36 
 
 36 
 
37 
	@Transient
 37 
	@Transient
38 
	private FranchiseeActivity franchiseeActivity;
 38 
	private FranchiseeActivity franchiseeActivity;
39 
 
 39 
 
40 
	@Column(name = "schedule_timestamp")
 40 
	@Column(name = "schedule_timestamp")
41 
	private LocalDateTime schelduleTimestamp;
 41 
	private LocalDateTime scheduleTimestamp;
42 
 
 42 
 
43 
	@Column(name = "agenda")
 43 
	@Column(name = "agenda")
44 
	private String agenda;
 44 
	private String agenda;
45 
 
 45 
 
46 
	@Column(name = "partner_remark")
 46 
	@Column(name = "partner_remark")
Line 108... Line 108...
108 
	private String createdBy;
 108 
	private String createdBy;
109 
 
 109 
 
110 
	@Column(name = "auth_id")
 110 
	@Column(name = "auth_id")
111 
	private int authId;
 111 
	private int authId;
112 
 
 112 
 
113 
	public LocalDateTime getSchelduleTimestamp() {
 113 
	public LocalDateTime getScheduleTimestamp() {
114 
		return schelduleTimestamp;
 114 
		return scheduleTimestamp;
115 
	}
 115 
	}
116 
 
 116 
 
117 
	public void setSchelduleTimestamp(LocalDateTime schelduleTimestamp) {
 117 
	public void setScheduleTimestamp(LocalDateTime schelduleTimestamp) {
118 
		this.schelduleTimestamp = schelduleTimestamp;
 118 
		this.scheduleTimestamp = schelduleTimestamp;
119 
	}
 119 
	}
120 
 
 120 
 
121 
	public List<String> getBrands() {
 121 
	public List<String> getBrands() {
122 
		return brands;
 122 
		return brands;
123 
	}
 123 
	}
Line 292... Line 292...
292 
 
 292 
 
293 
	public int getMtd() {
 293 
	public int getMtd() {
294 
		return mtd;
 294 
		return mtd;
295 
	}
 295 
	}
296 
 
 296 
 
297 
	public void setMtd(int mtd) {
 297 
	public void setMtd(int mtd) { }
298 
		this.mtd = mtd;
 - 
 
299 
	}
 - 
 
300 
 
 298 
 
301 
	public String getHygiene() {
 299 
	public String getHygiene() {
302 
		return hygiene;
 300 
		return hygiene;
303 
	}
 301 
	}
304 
 
 302 
 
Line 353... Line 351...
353 
		result = prime * result + ((outsideStock == null) ? 0 : outsideStock.hashCode());
 351 
		result = prime * result + ((outsideStock == null) ? 0 : outsideStock.hashCode());
354 
		result = prime * result + ((outsideVisibity == null) ? 0 : outsideVisibity.hashCode());
 352 
		result = prime * result + ((outsideVisibity == null) ? 0 : outsideVisibity.hashCode());
355 
		result = prime * result + ((partnerName == null) ? 0 : partnerName.hashCode());
 353 
		result = prime * result + ((partnerName == null) ? 0 : partnerName.hashCode());
356 
		result = prime * result + ((partnerRemark == null) ? 0 : partnerRemark.hashCode());
 354 
		result = prime * result + ((partnerRemark == null) ? 0 : partnerRemark.hashCode());
357 
		result = prime * result + pendingBilling;
 355 
		result = prime * result + pendingBilling;
358 
		result = prime * result + ((schelduleTimestamp == null) ? 0 : schelduleTimestamp.hashCode());
 356 
		result = prime * result + ((scheduleTimestamp == null) ? 0 : scheduleTimestamp.hashCode());
359 
		result = prime * result + ((smartdukaanTshirt == null) ? 0 : smartdukaanTshirt.hashCode());
 357 
		result = prime * result + ((smartdukaanTshirt == null) ? 0 : smartdukaanTshirt.hashCode());
360 
		result = prime * result + ((status == null) ? 0 : status.hashCode());
 358 
		result = prime * result + ((status == null) ? 0 : status.hashCode());
361 
		result = prime * result + ((systemKnowledge == null) ? 0 : systemKnowledge.hashCode());
 359 
		result = prime * result + ((systemKnowledge == null) ? 0 : systemKnowledge.hashCode());
362 
		result = prime * result + ((updatedTimestamp == null) ? 0 : updatedTimestamp.hashCode());
 360 
		result = prime * result + ((updatedTimestamp == null) ? 0 : updatedTimestamp.hashCode());
363 
		result = prime * result + ((workingDevice == null) ? 0 : workingDevice.hashCode());
 361 
		result = prime * result + ((workingDevice == null) ? 0 : workingDevice.hashCode());
Line 459... Line 457...
459 
				return false;
 457 
				return false;
460 
		} else if (!partnerRemark.equals(other.partnerRemark))
 458 
		} else if (!partnerRemark.equals(other.partnerRemark))
461 
			return false;
 459 
			return false;
462 
		if (pendingBilling != other.pendingBilling)
 460 
		if (pendingBilling != other.pendingBilling)
463 
			return false;
 461 
			return false;
464 
		if (schelduleTimestamp == null) {
 462 
		if (scheduleTimestamp == null) {
465 
			if (other.schelduleTimestamp != null)
 463 
			if (other.scheduleTimestamp != null)
466 
				return false;
 464 
				return false;
467 
		} else if (!schelduleTimestamp.equals(other.schelduleTimestamp))
 465 
		} else if (!scheduleTimestamp.equals(other.scheduleTimestamp))
468 
			return false;
 466 
			return false;
469 
		if (smartdukaanTshirt == null) {
 467 
		if (smartdukaanTshirt == null) {
470 
			if (other.smartdukaanTshirt != null)
 468 
			if (other.smartdukaanTshirt != null)
471 
				return false;
 469 
				return false;
472 
		} else if (!smartdukaanTshirt.equals(other.smartdukaanTshirt))
 470 
		} else if (!smartdukaanTshirt.equals(other.smartdukaanTshirt))
Line 497... Line 495...
497 
	}
 495 
	}
498 
 
 496 
 
499 
	@Override
 497 
	@Override
500 
	public String toString() {
 498 
	public String toString() {
501 
		return "FranchiseeVisit [id=" + id + ", fofoId=" + fofoId + ", partnerName=" + partnerName
 499 
		return "FranchiseeVisit [id=" + id + ", fofoId=" + fofoId + ", partnerName=" + partnerName
502 
				+ ", franchiseeActivity=" + franchiseeActivity + ", schelduleTimestamp=" + schelduleTimestamp
 500 
				+ ", franchiseeActivity=" + franchiseeActivity + ", scheduleTimestamp=" + scheduleTimestamp
503 
				+ ", agenda=" + agenda + ", partnerRemark=" + partnerRemark + ", outsideVisibity=" + outsideVisibity
 501 
				+ ", agenda=" + agenda + ", partnerRemark=" + partnerRemark + ", outsideVisibity=" + outsideVisibity
504 
				+ ", instoreVisibility=" + instoreVisibility + ", outsideStock=" + outsideStock + ", systemKnowledge="
 502 
				+ ", instoreVisibility=" + instoreVisibility + ", outsideStock=" + outsideStock + ", systemKnowledge="
505 
				+ systemKnowledge + ", workingDevice=" + workingDevice + ", workingPrinter=" + workingPrinter
 503 
				+ systemKnowledge + ", workingDevice=" + workingDevice + ", workingPrinter=" + workingPrinter
506 
				+ ", carryBags=" + carryBags + ", smartdukaanTshirt=" + smartdukaanTshirt + ", latestDummies="
 504 
				+ ", carryBags=" + carryBags + ", smartdukaanTshirt=" + smartdukaanTshirt + ", latestDummies="
507 
				+ latestDummies + ", investment=" + investment + ", mtd=" + mtd + ", status=" + status + ", hygiene="
 505 
				+ latestDummies + ", investment=" + investment + ", mtd=" + mtd + ", status=" + status + ", hygiene="