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