|  |  | @ -50,6 +50,8 @@ class MyAppointmentsViewModel extends ChangeNotifier { | 
			
		
	
		
		
			
				
					
					|  |  |  |   void onTabChange(int index) { |  |  |  |   void onTabChange(int index) { | 
			
		
	
		
		
			
				
					
					|  |  |  |     previouslySelectedTab = selectedTabIndex; |  |  |  |     previouslySelectedTab = selectedTabIndex; | 
			
		
	
		
		
			
				
					
					|  |  |  |     selectedTabIndex = index; |  |  |  |     selectedTabIndex = index; | 
			
		
	
		
		
			
				
					
					|  |  |  |  |  |  |  |     start = null; | 
			
		
	
		
		
			
				
					
					|  |  |  |  |  |  |  |     end = null; | 
			
		
	
		
		
			
				
					
					|  |  |  |     notifyListeners(); |  |  |  |     notifyListeners(); | 
			
		
	
		
		
			
				
					
					|  |  |  |   } |  |  |  |   } | 
			
		
	
		
		
			
				
					
					|  |  |  | 
 |  |  |  | 
 | 
			
		
	
	
		
		
			
				
					|  |  | @ -451,12 +453,12 @@ class MyAppointmentsViewModel extends ChangeNotifier { | 
			
		
	
		
		
			
				
					
					|  |  |  |           filteredAppointmentList.add(element); |  |  |  |           filteredAppointmentList.add(element); | 
			
		
	
		
		
			
				
					
					|  |  |  |         } |  |  |  |         } | 
			
		
	
		
		
			
				
					
					|  |  |  |       }); |  |  |  |       }); | 
			
		
	
		
		
			
				
					
					|  |  |  |       filteredAppointmentList.addAll(sourceList); |  |  |  |  | 
			
		
	
		
		
			
				
					
					|  |  |  |     } else { |  |  |  |     } else { | 
			
		
	
		
		
			
				
					
					|  |  |  |       filteredAppointmentList.clear(); |  |  |  |       filteredAppointmentList.clear(); | 
			
		
	
		
		
			
				
					
					|  |  |  |       sourceList.forEach((element) { |  |  |  |       sourceList.forEach((element) { | 
			
		
	
		
		
			
				
					
					|  |  |  |         try { |  |  |  |         try { | 
			
		
	
		
		
			
				
					
					|  |  |  |           var dateTime = DateUtil.convertStringToDate(element.appointmentDate); |  |  |  |           var dateTime = DateUtil.convertStringToDate(element.appointmentDate).provideDateOnly(); | 
			
				
				
			
		
	
		
		
	
		
		
			
				
					
					|  |  |  |  |  |  |  | 
 | 
			
		
	
		
		
			
				
					
					|  |  |  |           if (start != null && end == null) { |  |  |  |           if (start != null && end == null) { | 
			
		
	
		
		
			
				
					
					|  |  |  |             if (dateTime.isAtSameMomentAs(start)) { |  |  |  |             if (dateTime.isAtSameMomentAs(start)) { | 
			
		
	
		
		
			
				
					
					|  |  |  |               if (isUnderFilter(element)) { |  |  |  |               if (isUnderFilter(element)) { | 
			
		
	
	
		
		
			
				
					|  |  | @ -464,7 +466,7 @@ class MyAppointmentsViewModel extends ChangeNotifier { | 
			
		
	
		
		
			
				
					
					|  |  |  |               } |  |  |  |               } | 
			
		
	
		
		
			
				
					
					|  |  |  |             } |  |  |  |             } | 
			
		
	
		
		
			
				
					
					|  |  |  |           } else if (start != null && end != null) { |  |  |  |           } else if (start != null && end != null) { | 
			
		
	
		
		
			
				
					
					|  |  |  |             if ((dateTime.isAfter(start)) && (dateTime.isBefore(end))) { |  |  |  |             if ((dateTime.isAfter(start)) && ((dateTime.isBefore(end))||((dateTime.isAtSameMomentAs(end))))) { | 
			
				
				
			
		
	
		
		
	
		
		
			
				
					
					|  |  |  |               if (isUnderFilter(element)) { |  |  |  |               if (isUnderFilter(element)) { | 
			
		
	
		
		
			
				
					
					|  |  |  |                 filteredAppointmentList.add(element); |  |  |  |                 filteredAppointmentList.add(element); | 
			
		
	
		
		
			
				
					
					|  |  |  |               } |  |  |  |               } | 
			
		
	
	
		
		
			
				
					|  |  | 
 |