Compare commits
	
		
			1 Commits
		
	
	
		
			developmen
			...
			1bd33e96cb
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 1bd33e96cb | 
							
								
								
									
										8
									
								
								dates.py
									
									
									
									
									
								
							
							
						
						
									
										8
									
								
								dates.py
									
									
									
									
									
								
							| @@ -20,18 +20,23 @@ def get_days_of_month(months_back=0): | ||||
|  | ||||
|  | ||||
| def get_month_view(worklogs): | ||||
|  | ||||
|     week = datetime.datetime.strptime( | ||||
|         worklogs[0]["date"][0:10], '%Y-%m-%d').date() | ||||
|  | ||||
|     week_number_start = week | ||||
|     to_monday = week_number_start.weekday() | ||||
|     week_number_start -= datetime.timedelta(days=to_monday) | ||||
|     week_number_end = week_number_start+datetime.timedelta(days=6) | ||||
|  | ||||
|     week_iso = week.isocalendar().week | ||||
|     month_view = worklogs[0]["author"] | ||||
|  | ||||
|     for worklog in worklogs: | ||||
|         ticket = worklog["ticket_id"] | ||||
|         date = worklog["date"][0:10] | ||||
|         timespent = worklog["time_spent"] | ||||
|  | ||||
|         week_day = datetime.datetime.strptime(date, '%Y-%m-%d').date() | ||||
|         if (week_day.isocalendar().week == week_iso): | ||||
|             month_view += "\nWeek " + str(week_iso)+"\tfrom "+week_number_start.__str__() + \ | ||||
| @@ -39,6 +44,7 @@ def get_month_view(worklogs): | ||||
|             week_iso += 1 | ||||
|             week_number_start += datetime.timedelta(days=7) | ||||
|             week_number_end += datetime.timedelta(days=7) | ||||
|  | ||||
|         month_view += ticket+'\tdate '+date+'\ttime '+timespent + '\n' | ||||
|  | ||||
|     return month_view | ||||
| @@ -51,6 +57,7 @@ def date_getter(worklog): | ||||
| def get_days(day, weeks_back=False): | ||||
|     if weeks_back: | ||||
|         day = day - datetime.timedelta(weeks=weeks_back) | ||||
|  | ||||
|     year, weeknum, day_of_week = day.isocalendar() | ||||
|     while day_of_week != 1: | ||||
|         day = day - datetime.timedelta(days=1) | ||||
| @@ -63,6 +70,7 @@ def get_days(day, weeks_back=False): | ||||
|         days.append(day) | ||||
|         day = day + datetime.timedelta(days=1) | ||||
|         day_of_week += 1 | ||||
|  | ||||
|     days_second_part = [] | ||||
|     if day_of_week <= 7:  # This condition means the loop ended because the month changed | ||||
|         next_month = day.month | ||||
|   | ||||
		Reference in New Issue
	
	Block a user