Merge pull request #186 from nisum-inc/FEATURE/Appending_Zero_InLoginReport_TodayDateValidation

MT-175 Appending Zero In LoginReport and TodayDateValidation

src/main/java/com/nisum/mytime/service/EmployeeDataService.java

@@ -24,6 +24,7 @@ import org.springframework.stereotype.Component;
 import com.nisum.mytime.configuration.DbConnection;
 import com.nisum.mytime.exception.handler.MyTimeException;
 import com.nisum.mytime.model.EmpLoginData;
+import com.nisum.mytime.utils.CommomUtil;
 import com.nisum.mytime.utils.MyTimeLogger;
 import com.nisum.mytime.utils.MyTimeUtils;
 
@@ -106,6 +107,9 @@ public class EmployeeDataService {
                    date1= fromDate+" "+fromTime;
                    date2=nextDate+" "+toTime;             
             	}
+            	if(i==differentBetweenDays && formatedNextDate==LocalDate.now()) {         
+            		date2=nextDate+" "+"23:59"; 
+            	}
                 querys =MyTimeUtils.LOGIN_REPORT_BY_TIME + "'" +date1+ "'"+MyTimeUtils.LOGIN_REPORT_BY_TIME2+"'"+date2+"'"
                 		+MyTimeUtils.LOGIN_REPORT_BY_TIME3+employeeId+ MyTimeUtils.LOGIN_REPORT_BY_TIME4;
                 
@@ -123,13 +127,13 @@ public class EmployeeDataService {
                     
                     LocalDateTime loginTime= resultSet.getTimestamp("FirstLogin").toLocalDateTime();
                     LocalDateTime logoutTime= resultSet.getTimestamp("LastLogin").toLocalDateTime();
-                     
                     long totalseconds = java.time.Duration.between(loginTime, logoutTime).getSeconds();
+                    
                     int hours = (int) (totalseconds / 3600);
                     int minutes = (int) ((totalseconds % 3600) / 60);             
                     int seconds = (int) ((totalseconds % 3600) % 60);  
                       
-                    empLoginData.setTotalLoginTime(hours + ":" + minutes + ":" + seconds);
+                    empLoginData.setTotalLoginTime(CommomUtil.appendZero(hours) + ":" + CommomUtil.appendZero(minutes) + ":" + CommomUtil.appendZero(seconds));
                     Date d = MyTimeUtils.tdf.parse(empLoginData.getTotalLoginTime());
                     countHours += d.getTime();
 

src/main/java/com/nisum/mytime/utils/CommomUtil.java

@@ -24,4 +24,7 @@ public class CommomUtil {
 	        return deletedManager;
 	    }
 
+	    public static String appendZero(int val) {
+	    	return val<10?("0"+val):(val+"");  
+	    } 
 }