diff --git a/src/draggable/drop_area.tsx b/src/draggable/drop_area.tsx index a88acf1f7..a273b4d64 100644 --- a/src/draggable/drop_area.tsx +++ b/src/draggable/drop_area.tsx @@ -6,28 +6,36 @@ export class DropArea extends React.Component { state: DropAreaState = { isHovered: false }; - dragOver = (e: React.DragEvent) => e.preventDefault(); + dragOver = (e: React.DragEvent) => { + console.log("DRAGOVER"); + e.preventDefault(); + } drop = (e: React.DragEvent) => { e.preventDefault(); let key = e.dataTransfer.getData(STEP_DATATRANSFER_IDENTIFER); + console.log(key || "NO_KEY"); let fn = this.props.callback; if (fn) { fn(key); } this.toggle(); } - toggle = () => this.setState({ isHovered: !this.state.isHovered }); + toggle = () => { + console.log("TOGGLE"); + this.setState({ isHovered: !this.state.isHovered }); + }; render() { let isVisible = this.props.isLocked || this.state.isHovered; let klass = isVisible ? "drag-drop-area" : ""; return
{ console.log("hey"); }} onDragLeave={this.toggle} onDragEnter={this.toggle} onDragOver={this.dragOver} onDrop={this.drop} - style={{ minHeight: "1.25rem", border: "1px solid red" }} > + style={{ minHeight: "1.5rem", border: "1px solid red" }} > {this.props.children}
; } diff --git a/src/draggable/step_dragger.tsx b/src/draggable/step_dragger.tsx index 6ff1455e7..711972b6b 100644 --- a/src/draggable/step_dragger.tsx +++ b/src/draggable/step_dragger.tsx @@ -26,6 +26,7 @@ export let stepDragEventHandler = (dispatch: Function, intent: DataXferIntent, draggerId: number) => (ev: React.DragEvent) => { + console.log("!!!"); addGhostImage(ev, ghostCss); dispatch(stepPut(step, ev, intent, draggerId)); }; diff --git a/src/farm_designer/farm_events/map_state_to_props.ts b/src/farm_designer/farm_events/map_state_to_props.ts index d2fa93e75..f9f135d3f 100644 --- a/src/farm_designer/farm_events/map_state_to_props.ts +++ b/src/farm_designer/farm_events/map_state_to_props.ts @@ -40,6 +40,7 @@ export let regimenCalendarAdder = (index: ResourceIndex) => let fromEpoch = (ms: number) => moment(f.start_time) .startOf("day") .add(ms, "ms"); + c.insert(occurrence(moment(f.start_time), f)); regimen_items.map(ri => { let time = fromEpoch(ri.time_offset); if (time.isAfter(now) && time.isAfter(moment(f.start_time))) { diff --git a/src/sequences/step_buttons/index.tsx b/src/sequences/step_buttons/index.tsx index fc1bcd9c5..b0205f3c0 100644 --- a/src/sequences/step_buttons/index.tsx +++ b/src/sequences/step_buttons/index.tsx @@ -12,7 +12,7 @@ let stepClick = (dispatch: Function, step: Step, seq: TaggedSequence | undefined if (seq) { pushStep(step, dispatch, seq); } else { - error("Select a sequence first") + error("Select a sequence first"); } }; diff --git a/tslint.json b/tslint.json index a9fda2f38..71d3538f8 100644 --- a/tslint.json +++ b/tslint.json @@ -65,6 +65,7 @@ "no-trailing-whitespace": true, "no-unused-locals": true, "no-unused-parameters": true, + "no-unused-expression": true, "no-unused-variable": [ true ],