20
20
</template >
21
21
22
22
<script >
23
+ import {getTodayDate } from ' ../../date.js' ;
23
24
export default {
24
25
name: " DailyCalendar" ,
25
26
props: {
@@ -38,14 +39,12 @@ export default {
38
39
39
40
computed: {
40
41
combinedEvents () {
41
- const today = this . getTodayDate ();
42
+ const today = getTodayDate ();
42
43
const events = [
43
44
... this .list1 .map ((event ) => ({ ... event , listType: " list1" })),
44
45
... this .list2 .map ((event ) => ({ ... event , listType: " list2" })),
45
46
];
46
47
47
- console .log (' Computed Combined Events:' , events .filter ((event ) => event .scheduledDate === today));
48
-
49
48
return events .filter ((event ) => event .scheduledDate === today);
50
49
},
51
50
},
@@ -70,6 +69,8 @@ export default {
70
69
},
71
70
72
71
getEventStyle (event ) {
72
+ console .log (event );
73
+ console .log (event .scheduledTime );
73
74
const startHour = this .parseTime (event .scheduledTime );
74
75
let endHour = startHour + event .taskTimeEstimate / 60 ;
75
76
@@ -98,16 +99,10 @@ export default {
98
99
this .$emit (" event-clicked" , { event , listType: event .listType , index });
99
100
},
100
101
101
- getTodayDate () {
102
- const today = new Date ();
103
- const year = today .getFullYear ();
104
- const month = (today .getMonth () + 1 ).toString ().padStart (2 , " 0" );
105
- const day = today .getDate ().toString ().padStart (2 , " 0" );
106
- return ` ${ year} -${ month} -${ day} ` ; // Format: YYYY-MM-DD
107
- },
108
-
109
102
// Updated parseTime method to handle various formats like '2:00pm', '09:59am', '9:59am'
110
103
parseTime (time ) {
104
+ if (time== null )
105
+ time= Date .now ().toString ();
111
106
const regex = / (\d {1,2} ):(\d {2} )(am| pm)/ i ;
112
107
const match = time .trim ().match (regex);
113
108
if (! match) return 0 ; // Default if time format is invalid
0 commit comments