Try renderinf start_time
parent
38aff632ed
commit
ad0c12b422
|
@ -6,28 +6,36 @@ export class DropArea extends React.Component<DropAreaProps, DropAreaState> {
|
||||||
|
|
||||||
state: DropAreaState = { isHovered: false };
|
state: DropAreaState = { isHovered: false };
|
||||||
|
|
||||||
dragOver = (e: React.DragEvent<HTMLElement>) => e.preventDefault();
|
dragOver = (e: React.DragEvent<HTMLElement>) => {
|
||||||
|
console.log("DRAGOVER");
|
||||||
|
e.preventDefault();
|
||||||
|
}
|
||||||
|
|
||||||
drop = (e: React.DragEvent<HTMLElement>) => {
|
drop = (e: React.DragEvent<HTMLElement>) => {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
let key = e.dataTransfer.getData(STEP_DATATRANSFER_IDENTIFER);
|
let key = e.dataTransfer.getData(STEP_DATATRANSFER_IDENTIFER);
|
||||||
|
console.log(key || "NO_KEY");
|
||||||
let fn = this.props.callback;
|
let fn = this.props.callback;
|
||||||
if (fn) { fn(key); }
|
if (fn) { fn(key); }
|
||||||
this.toggle();
|
this.toggle();
|
||||||
}
|
}
|
||||||
|
|
||||||
toggle = () => this.setState({ isHovered: !this.state.isHovered });
|
toggle = () => {
|
||||||
|
console.log("TOGGLE");
|
||||||
|
this.setState({ isHovered: !this.state.isHovered });
|
||||||
|
};
|
||||||
|
|
||||||
render() {
|
render() {
|
||||||
let isVisible = this.props.isLocked || this.state.isHovered;
|
let isVisible = this.props.isLocked || this.state.isHovered;
|
||||||
let klass = isVisible ? "drag-drop-area" : "";
|
let klass = isVisible ? "drag-drop-area" : "";
|
||||||
return <div
|
return <div
|
||||||
className={klass}
|
className={klass}
|
||||||
|
onMouseOver={() => { console.log("hey"); }}
|
||||||
onDragLeave={this.toggle}
|
onDragLeave={this.toggle}
|
||||||
onDragEnter={this.toggle}
|
onDragEnter={this.toggle}
|
||||||
onDragOver={this.dragOver}
|
onDragOver={this.dragOver}
|
||||||
onDrop={this.drop}
|
onDrop={this.drop}
|
||||||
style={{ minHeight: "1.25rem", border: "1px solid red" }} >
|
style={{ minHeight: "1.5rem", border: "1px solid red" }} >
|
||||||
{this.props.children}
|
{this.props.children}
|
||||||
</div>;
|
</div>;
|
||||||
}
|
}
|
||||||
|
|
|
@ -26,6 +26,7 @@ export let stepDragEventHandler = (dispatch: Function,
|
||||||
intent: DataXferIntent,
|
intent: DataXferIntent,
|
||||||
draggerId: number) =>
|
draggerId: number) =>
|
||||||
(ev: React.DragEvent<HTMLElement>) => {
|
(ev: React.DragEvent<HTMLElement>) => {
|
||||||
|
console.log("!!!");
|
||||||
addGhostImage(ev, ghostCss);
|
addGhostImage(ev, ghostCss);
|
||||||
dispatch(stepPut(step, ev, intent, draggerId));
|
dispatch(stepPut(step, ev, intent, draggerId));
|
||||||
};
|
};
|
||||||
|
|
|
@ -40,6 +40,7 @@ export let regimenCalendarAdder = (index: ResourceIndex) =>
|
||||||
let fromEpoch = (ms: number) => moment(f.start_time)
|
let fromEpoch = (ms: number) => moment(f.start_time)
|
||||||
.startOf("day")
|
.startOf("day")
|
||||||
.add(ms, "ms");
|
.add(ms, "ms");
|
||||||
|
c.insert(occurrence(moment(f.start_time), f));
|
||||||
regimen_items.map(ri => {
|
regimen_items.map(ri => {
|
||||||
let time = fromEpoch(ri.time_offset);
|
let time = fromEpoch(ri.time_offset);
|
||||||
if (time.isAfter(now) && time.isAfter(moment(f.start_time))) {
|
if (time.isAfter(now) && time.isAfter(moment(f.start_time))) {
|
||||||
|
|
|
@ -12,7 +12,7 @@ let stepClick = (dispatch: Function, step: Step, seq: TaggedSequence | undefined
|
||||||
if (seq) {
|
if (seq) {
|
||||||
pushStep(step, dispatch, seq);
|
pushStep(step, dispatch, seq);
|
||||||
} else {
|
} else {
|
||||||
error("Select a sequence first")
|
error("Select a sequence first");
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -65,6 +65,7 @@
|
||||||
"no-trailing-whitespace": true,
|
"no-trailing-whitespace": true,
|
||||||
"no-unused-locals": true,
|
"no-unused-locals": true,
|
||||||
"no-unused-parameters": true,
|
"no-unused-parameters": true,
|
||||||
|
"no-unused-expression": true,
|
||||||
"no-unused-variable": [
|
"no-unused-variable": [
|
||||||
true
|
true
|
||||||
],
|
],
|
||||||
|
|
Loading…
Reference in New Issue