Projects >> plugin-paymentview >>d7a66892c8e340974e40bda5c1d1b81133c0d6b1

Chunk
Conflicting content 
		
		int endDay = 0;
		Target tgt = targetDao.getTargetById(targetId);
<<<<<<< HEAD
		String totalAmount = tgt.getServiceItem().getAmount().toString();
		String totalInstalmentsCount = "0";
=======
		String prem = tgt.getTotalTargetCost().toString();
		String instalmentsCount = "0";
>>>>>>> 0f54b1a361ae991b1c4fa2b3b7086b7a6a3645ee
		Date startDateStr = tgt.getStartDate();
		Date endDateStr = tgt.getEndDate();
Solution content 
		
		int endDay = 0;
		Target tgt = targetDao.getTargetById(targetId);
		String totalAmount = tgt.getServiceItem().getAmount().toString();
		String totalInstalmentsCount = "0";
		Date startDateStr = tgt.getStartDate();
		Date endDateStr = tgt.getEndDate();
File
TargetAnalytics.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
		targetAnalytics = new TargetAnalytics();
		targetAnalytics.setIncomingPaymentDao(pluginController.getIncomingPaymentDao());
		targetAnalytics.setTargetDao(targetDao);
<<<<<<< HEAD

=======
>>>>>>> 0f54b1a361ae991b1c4fa2b3b7086b7a6a3645ee
		initSettingsTableForSorting();
	}
Solution content 
		targetAnalytics = new TargetAnalytics();
		targetAnalytics.setIncomingPaymentDao(pluginController.getIncomingPaymentDao());
		targetAnalytics.setTargetDao(targetDao);
		initSettingsTableForSorting();
	}
File
CreateSettingsTableHandler.java
Developer's decision
Version 1
Kind of conflict
Blank
Chunk
Conflicting content 
			getAccount(incomingPayment.getPhoneNumber()).getAccountNumber()
		);
		
<<<<<<< HEAD
		if (tgt != null) {
			targetAnalytics.computeAnalyticsIntervalDatesAndSavings(tgt.getId());
			
			for (FormatterMarkerType fe : formatEnums) {
				if(message.contains(fe.getMarker())){
					switch (fe) {
				      case CLIENT_NAME:
				    	  formed_message = message.replace(fe.getMarker(), clientDao.getClientByPhoneNumber(incomingPayment.getPhoneNumber()).getFullName());
				    	  message = formed_message ;
				        break;
				      case AMOUNT_PAID:
				    	  formed_message = message.replace(fe.getMarker(), incomingPayment.getAmountPaid().toString());
				    	  message = formed_message ;
				        break;
				      case AMOUNT_REMAINING:
				    	  formed_message = message.replace(fe.getMarker(), tgt.getServiceItem().getAmount().subtract(targetAnalytics.getAmountSaved(tgt.getId())).toString());
				    	  message = formed_message ;
				        break;
				      case DATE_PAID:
				    	  formed_message = message.replace(fe.getMarker(), PvUtils.formatDate(incomingPayment.getTimePaid()));
				    	  message = formed_message ;
				        break;
				      case DAYS_REMAINING:
				    	  formed_message = message.replace(fe.getMarker(), targetAnalytics.getDaysRemaining(tgt.getId()).toString());
				    	  message = formed_message ;
				        break;
				      case MONTHLY_DUE:
				    	  formed_message = message.replace(fe.getMarker(), targetAnalytics.getMonthlyAmountDue().toString());
				    	  message = formed_message ;
				        break;
				      case END_MONTH_INTERVAL:
				    	  formed_message = message.replace(fe.getMarker(), PvUtils.formatDate(targetAnalytics.getEndMonthInterval()));
				    	  message = formed_message ;
				        break;
				      case MONTHLY_SAVINGS:
				    	  formed_message = message.replace(fe.getMarker(), targetAnalytics.getMonthlyAmountSaved().toString());
				    	  message = formed_message ;
				        break;
				      case RECEPIENT_NAME:
				    	  formed_message = message.replace(fe.getMarker(), incomingPayment.getPaymentBy());
				    	  message = formed_message ;
				        break;
				      case TARGET_ENDDATE:
				    	  formed_message = message.replace(fe.getMarker(), PvUtils.formatDate(tgt.getEndDate()));
				    	  message = formed_message ;
				        break;
				    }
				}
=======
		for (FormatterMarkerType fe : formatEnums) {
			if(message.contains(fe.getMarker())){
				switch (fe) {
			      case CLIENT_NAME:
			    	  formed_message = message.replace(fe.getMarker(), incomingPayment.getPaymentBy());
			    	  message = formed_message ;
			        break;
			      case AMOUNT_PAID:
			    	  formed_message = message.replace(fe.getMarker(), incomingPayment.getAmountPaid().toString());
			    	  message = formed_message ;
			        break;
			      case AMOUNT_REMAINING:
			    	  formed_message = message.replace(fe.getMarker(), tgt.getTotalTargetCost().subtract(targetAnalytics.getAmountSaved(tgt.getId())).toString());
			    	  message = formed_message ;
			        break;
			      case DATE_PAID:
			    	  formed_message = message.replace(fe.getMarker(), PvUtils.formatDate(incomingPayment.getTimePaid()));
			    	  message = formed_message ;
			        break;
			      case DAYS_REMAINING:
			    	  formed_message = message.replace(fe.getMarker(), targetAnalytics.getDaysRemaining(tgt.getId()).toString());
			    	  message = formed_message ;
			        break;
			      case MONTHLY_DUE:
			    	  formed_message = message.replace(fe.getMarker(), targetAnalytics.getMonthlyAmountDue().toString());
			    	  message = formed_message ;
			        break;
			      case END_MONTH_INTERVAL:
			    	  formed_message = message.replace(fe.getMarker(), PvUtils.formatDate(targetAnalytics.getEndMonthInterval()));
			    	  message = formed_message ;
			        break;
			      case MONTHLY_SAVINGS:
			    	  formed_message = message.replace(fe.getMarker(), targetAnalytics.getMonthlyAmountSaved().toString());
			    	  message = formed_message ;
			        break;
			      case RECEPIENT_NAME:
			    	  formed_message = message.replace(fe.getMarker(), incomingPayment.getPaymentBy());
			    	  message = formed_message ;
			        break;
			      case TARGET_ENDDATE:
			    	  formed_message = message.replace(fe.getMarker(), PvUtils.formatDate(tgt.getEndDate()));
			    	  message = formed_message ;
			        break;
			    }
>>>>>>> 0f54b1a361ae991b1c4fa2b3b7086b7a6a3645ee
			}
			return message;
		}
Solution content 
			getAccount(incomingPayment.getPhoneNumber()).getAccountNumber()
		);
		
		if (tgt != null) {
			targetAnalytics.computeAnalyticsIntervalDatesAndSavings(tgt.getId());
			
			for (FormatterMarkerType fe : formatEnums) {
				if(message.contains(fe.getMarker())){
					switch (fe) {
				      case CLIENT_NAME:
				    	  formed_message = message.replace(fe.getMarker(), clientDao.getClientByPhoneNumber(incomingPayment.getPhoneNumber()).getFullName());
				    	  message = formed_message ;
				        break;
				      case AMOUNT_PAID:
				    	  formed_message = message.replace(fe.getMarker(), incomingPayment.getAmountPaid().toString());
				    	  message = formed_message ;
				        break;
				      case AMOUNT_REMAINING:
				    	  formed_message = message.replace(fe.getMarker(), tgt.getServiceItem().getAmount().subtract(targetAnalytics.getAmountSaved(tgt.getId())).toString());
				    	  message = formed_message ;
				        break;
				      case DATE_PAID:
				    	  formed_message = message.replace(fe.getMarker(), PvUtils.formatDate(incomingPayment.getTimePaid()));
				    	  message = formed_message ;
				        break;
				      case DAYS_REMAINING:
				    	  formed_message = message.replace(fe.getMarker(), targetAnalytics.getDaysRemaining(tgt.getId()).toString());
				    	  message = formed_message ;
				        break;
				      case MONTHLY_DUE:
				    	  formed_message = message.replace(fe.getMarker(), targetAnalytics.getMonthlyAmountDue().toString());
				    	  message = formed_message ;
				        break;
				      case END_MONTH_INTERVAL:
				    	  formed_message = message.replace(fe.getMarker(), PvUtils.formatDate(targetAnalytics.getEndMonthInterval()));
				    	  message = formed_message ;
				        break;
				      case MONTHLY_SAVINGS:
				    	  formed_message = message.replace(fe.getMarker(), targetAnalytics.getMonthlyAmountSaved().toString());
				    	  message = formed_message ;
				        break;
				      case RECEPIENT_NAME:
				    	  formed_message = message.replace(fe.getMarker(), incomingPayment.getPaymentBy());
				    	  message = formed_message ;
				        break;
				      case TARGET_ENDDATE:
				    	  formed_message = message.replace(fe.getMarker(), PvUtils.formatDate(tgt.getEndDate()));
				    	  message = formed_message ;
				        break;
				    }
				}
			}
			return message;
		}
File
IncomingPaymentsTabHandler.java
Developer's decision
Version 1
Kind of conflict
For statement
If statement
Method invocation
Switch statement
Chunk
Conflicting content 
		Date endDate = calEndDate.getTime();
		endOfIntervalDate = endDate;
		
<<<<<<< HEAD
		Account acc = getAccountNumber("104",1);
		ServiceItem si = saveServiceItem("Solar Cooker","9300", 1);
		Target tgt = createTarget(acc, si, startDate, endDate);
=======
		Account acc = getAccountNumber("104");
		Target tgt = createTarget(acc, new BigDecimal("9300"), startDate, endDate);
>>>>>>> 0f54b1a361ae991b1c4fa2b3b7086b7a6a3645ee
		targetId = tgt.getId();
		createIncomingPayment("0723000000","4500","Mr. Renyenjes", acc, tgt,new Date());
		createIncomingPayment("0723000000","2500","Mr. Renyenjes", acc, tgt,new Date());
Solution content 
		Date endDate = calEndDate.getTime();
		endOfIntervalDate = endDate;
		
		Account acc = getAccountNumber("104",1);
		Target tgt = createTarget(acc, new BigDecimal("9300"), startDate, endDate);
		targetId = tgt.getId();
		createIncomingPayment("0723000000","4500","Mr. Renyenjes", acc, tgt,new Date());
		createIncomingPayment("0723000000","2500","Mr. Renyenjes", acc, tgt,new Date());
File
TargetAnalyticsIntegrationTest.java
Developer's decision
Combination
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
=======
		return acc;
	}
	
<<<<<<< HEAD
	private ServiceItem saveServiceItem(String serviceItemName, String amount, int expectedCount) throws DuplicateKeyException{
		ServiceItem si = getServiceItem(serviceItemName, amount);
		this.hibernateServiceItemDao.saveServiceItem(si);
		assertEquals(expectedCount, this.hibernateServiceItemDao.getServiceItemCount());
		
		return si;
	}
	
	private ServiceItem getServiceItem(String serviceItemName, String amount){
		ServiceItem si = new ServiceItem();
		si.setTargetName(serviceItemName);
		si.setAmount(new BigDecimal(amount));
		return si;
	}
	
>>>>>>> 0f54b1a361ae991b1c4fa2b3b7086b7a6a3645ee
	private IncomingPayment createIncomingPayment(String phoneNumber, String amount,
			String by, Account account, Target tgt, Date date) {
		try {
Solution content 
		return acc;
	}
	
	private IncomingPayment createIncomingPayment(String phoneNumber, String amount,
			String by, Account account, Target tgt, Date date) {
		try {
File
TargetAnalyticsIntegrationTest.java
Developer's decision
Version 2
Kind of conflict
Method declaration