Subversion Repositories SmartDukaan

Rev

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

Rev 27427 Rev 27428
Line 101... Line 101...
101 
 
 101 
 
102 
		double lat1 = 28.516045882182738;
 102 
		double lat1 = 28.516045882182738;
103 
		double lng1 = 77.3771954997187;
 103 
		double lng1 = 77.3771954997187;
104 
 
 104 
 
105 
		HypertrackKey hyperTrackKey = hypertrackKeyRepository.selectByUserIdAndDeviceId(userId, deviceId);
 105 
		HypertrackKey hyperTrackKey = hypertrackKeyRepository.selectByUserIdAndDeviceId(userId, deviceId);
- 
 
 106 
		// EmployeeAttendance employeeAttendance =
- 
 
 107 
		// employeeAttendanceRepository.selectLatestPunchTimeStamp();
- 
 
 108 
 
106 
		EmployeeAttendance employeeAttendance = employeeAttendanceRepository.selectLatestPunchTimeStamp();
 109 
		List<EmployeeAttendance> employeeAttendances = employeeAttendanceRepository.selectByUserIdKey(userId, deviceId,
- 
 
 110 
				LocalDate.now());
107 
		OkHttpClient client = new OkHttpClient();
 111 
		OkHttpClient client = new OkHttpClient();
108 
 
 112 
 
109 
		String authString = "Basic "
 113 
		String authString = "Basic "
110 
				+ Base64.getEncoder().encodeToString(String.format("%s:%s", ACCOUNT_ID, SECRET_KEY).getBytes());
 114 
				+ Base64.getEncoder().encodeToString(String.format("%s:%s", ACCOUNT_ID, SECRET_KEY).getBytes());
111 
 
 115 
 
Line 124... Line 128...
124 
		EmployeeAttendanceModel em = new EmployeeAttendanceModel();
 128 
		EmployeeAttendanceModel em = new EmployeeAttendanceModel();
125 
		em.setDistance(dist);
 129 
		em.setDistance(dist);
126 
		em.setLatitude(lat2);
 130 
		em.setLatitude(lat2);
127 
		em.setLongitude(lng2);
 131 
		em.setLongitude(lng2);
128 
		LOGGER.info("hyperTrackKey" + hyperTrackKey);
 132 
		LOGGER.info("hyperTrackKey" + hyperTrackKey);
129 
		LOGGER.info("employeeAttendance" + employeeAttendance);
 133 
		LOGGER.info("employeeAttendance" + employeeAttendances);
- 
 
 134 
		if (!employeeAttendances.isEmpty()) {
130 
		if (employeeAttendance.getCreateTimestamp().toLocalDate().equals(LocalDate.now())) {
 135 
			if (employeeAttendances.get(0).getCreateTimestamp().toLocalDate().equals(LocalDate.now())) {
131 
			if (employeeAttendance.getPunch().equals("punchIn")) {
 136 
				if (employeeAttendances.get(0).getPunch().equals("punchIn")) {
132 
				em.setPunchIn(true);
 137 
					em.setPunchIn(true);
- 
 
 138 
				} else {
- 
 
 139 
					em.setPunchIn(false);
- 
 
 140 
				}
133 
			} else {
 141 
			} else {
134 
				em.setPunchIn(false);
 142 
				em.setPunchIn(false);
135 
			}
 143 
			}
136 
		} else {
 144 
		} else {
137 
			em.setPunchIn(false);
 145 
			em.setPunchIn(false);
138 
		}
 146 
		}
139 
 
 - 
 
140 
		return responseSender.ok(em);
 147 
		return responseSender.ok(em);
141 
	}
 148 
	}
142 
 
 149 
 
143 
	private static double distance(double lat1, double lon1, double lat2, double lon2, String unit) {
 150 
	private static double distance(double lat1, double lon1, double lat2, double lon2, String unit) {
144 
		if ((lat1 == lat2) && (lon1 == lon2)) {
 151 
		if ((lat1 == lat2) && (lon1 == lon2)) {