@tactics/toddle-styleguide 1.7.22 → 1.7.25

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tactics/toddle-styleguide",
-  "version": "1.7.22",
+  "version": "1.7.25",
   "main": "index.tsx",
   "types": "index.d.ts",
   "prepublish": "tsc",

package/src/components/organisms/journal-entry/components/journal-entry-type/journal-entry-type.component.tsx

@@ -11,7 +11,7 @@ import React from 'react';
 interface JournalEntryTypeProps {
   prio: boolean;
   type: string;
-  happenedAt: ToddleDateTime;
+  happenedAt?: ToddleDateTime;
   loading?: boolean;
   send: boolean;
 }
@@ -47,13 +47,14 @@ export const JournalEntryType = ({
       <View style={styles.entryTypeTextContainer}>
         <View>
           <SmallText bold={true} textColor={context.colors.ui.darkgrey}>
-            {`${type} - `}
+            {`${type}`}
           </SmallText>
         </View>
         <View>
+          {happenedAt ?
           <SmallText textColor={context.colors.ui.darkgrey}>
-            {happenedAt.toFormat("H:mm")}
-          </SmallText>
+            {` - ` + happenedAt.toFormat("H:mm")}
+          </SmallText> : null}
         </View>
       </View>
     </>

package/src/components/organisms/journal-entry/journal-entry.component.tsx

@@ -18,7 +18,7 @@ import {LoadingIndicator} from '../loading-indicator/loading-indicator.component
 interface JournalEntryProps {
   id: string;
   prio: boolean;
-  happenedAt: ToddleDateTime;
+  happenedAt?: ToddleDateTime;
   type: string;
   text: string;
   visualState: VisualState;

package/src/components/organisms/timetable-editor/timetable-editor.component.tsx

@@ -20,7 +20,6 @@ export const TimetableEditor = ({sequence, onChange}: TimetableEditorProps) => {
     const [first, setFrist] = useState<TimeSlotRecord>(sequence.first);
     const [second, setSecond] = useState<TimeSlotRecord>(sequence.second);
     const [third, setThird] = useState<TimeSlotRecord>(sequence.third);
-    const [fourth, setFourth] = useState<TimeSlotRecord>(sequence.fourth);
 
     useEffect(() => {
         const newSeq = TimeSlotSequence.fromEmpty();
@@ -30,11 +29,9 @@ export const TimetableEditor = ({sequence, onChange}: TimetableEditorProps) => {
         newSeq.second.end = second.end;
         newSeq.third.start = third.start;
         newSeq.third.end = third.end;
-        newSeq.fourth.start = fourth.start;
-        newSeq.fourth.end = fourth.end;
 
         onChange(newSeq);
-    }, [first, second, third, fourth])
+    }, [first, second, third])
 
     return (
         <View style={styles.rootContainer}>
@@ -59,13 +56,6 @@ export const TimetableEditor = ({sequence, onChange}: TimetableEditorProps) => {
                 editState={activeIndex === 3 ? activeEditState : TimetableEditState.NONE}
                 onPressTag={(val,index) => { setActiveIndex(index); setActiveEditState(val);}}
             />
-            <TimetableEditWrapper
-                index={4}
-                record={fourth}
-                onUpdate={(seq) => {setFourth(TimeSlotRecord.fromRecord(seq))}}
-                editState={activeIndex === 4 ? activeEditState : TimetableEditState.NONE}
-                onPressTag={(val,index) => { setActiveIndex(index); setActiveEditState(val);}}
-            />
         </View>
     );
 }

package/src/models/time-slot-sequence.d.ts

@@ -3,7 +3,6 @@ export declare class TimeSlotSequence {
     readonly first: TimeSlotRecord;
     readonly second: TimeSlotRecord;
     readonly third: TimeSlotRecord;
-    readonly fourth: TimeSlotRecord;
     private constructor();
     static fromAttendanceRecordArray(arr: TimeSlotRecord[]): TimeSlotSequence;
     static fromTimeSlotRecordJSONArray(arr: TimeSlotRecordJSON[]): TimeSlotSequence;

package/src/models/time-slot-sequence.ts

@@ -5,15 +5,13 @@ export class TimeSlotSequence {
     public readonly first: TimeSlotRecord,
     public readonly second: TimeSlotRecord,
     public readonly third: TimeSlotRecord,
-    public readonly fourth: TimeSlotRecord
   ) {}
 
   static fromAttendanceRecordArray(arr: TimeSlotRecord[]): TimeSlotSequence {
     return new TimeSlotSequence(
       arr[0] ? arr[0] : TimeSlotRecord.fromEmpty(),
       arr[1] ? arr[1] : TimeSlotRecord.fromEmpty(),
-      arr[2] ? arr[2] : TimeSlotRecord.fromEmpty(),
-      arr[3] ? arr[3] : TimeSlotRecord.fromEmpty()
+      arr[2] ? arr[2] : TimeSlotRecord.fromEmpty()
     );
   }
 
@@ -24,7 +22,6 @@ export class TimeSlotSequence {
       TimeSlotRecord.fromJson(arr[0]),
       TimeSlotRecord.fromJson(arr[1]),
       TimeSlotRecord.fromJson(arr[2]),
-      TimeSlotRecord.fromJson(arr[3])
     );
   }
 
@@ -33,16 +30,15 @@ export class TimeSlotSequence {
       TimeSlotRecord.fromEmpty(),
       TimeSlotRecord.fromEmpty(),
       TimeSlotRecord.fromEmpty(),
-      TimeSlotRecord.fromEmpty()
     );
   }
 
   asArray(): TimeSlotRecord[] {
-    return [this.first, this.second, this.third, this.fourth];
+    return [this.first, this.second, this.third];
   }
 
   toJson(): TimeSlotRecord[] {
-    return [this.first, this.second, this.third, this.fourth];
+    return [this.first, this.second, this.third];
   }
 
   addToNextSlot(checkInOutTime: string) {
@@ -58,10 +54,6 @@ export class TimeSlotSequence {
       this.third.start = checkInOutTime;
     } else if (this.third.end === undefined || this.third.end === '') {
       this.third.end = checkInOutTime;
-    } else if (this.fourth.start === '') {
-      this.fourth.start = checkInOutTime;
-    } else if (this.fourth.end === undefined || this.fourth.end === '') {
-      this.fourth.end = checkInOutTime;
     }
   }
 
@@ -69,8 +61,7 @@ export class TimeSlotSequence {
     return (
       this.first.isComplete() &&
       this.second.isComplete() &&
-      this.third.isComplete() &&
-      this.fourth.isComplete()
+      this.third.isComplete()
     );
   }
 
@@ -78,8 +69,7 @@ export class TimeSlotSequence {
     return (
         this.first.isEmpty() &&
         this.second.isEmpty() &&
-        this.third.isEmpty() &&
-        this.fourth.isEmpty()
+        this.third.isEmpty()
     );
   }
 }