Enhance login functionality in AuthController and AuthService; add optional action parameter to login method, execute corresponding actions post-login, and handle action warnings. Update frontend components to trigger data refresh on successful login and display warnings if actions fail. Adjust SQL query in TimeEntryService for improved grouping.
This commit is contained in:
@@ -1069,7 +1069,7 @@ class TimeEntryService {
|
||||
AND w1.user_id = ?
|
||||
AND DATE(COALESCE(w1_fix.fix_date_time, w1.tstamp)) <= ?
|
||||
AND DAYOFWEEK(DATE(COALESCE(w1_fix.fix_date_time, w1.tstamp))) BETWEEN 2 AND 6
|
||||
GROUP BY DATE(COALESCE(w1_fix.fix_date_time, w1.tstamp))
|
||||
GROUP BY DATE(COALESCE(w1_fix.fix_date_time, w1.tstamp)), DAYOFWEEK(DATE(COALESCE(w1_fix.fix_date_time, w1.tstamp)))
|
||||
ORDER BY DATE(COALESCE(w1_fix.fix_date_time, w1.tstamp))
|
||||
`;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user