ywana-core8 0.0.515 → 0.0.518

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ywana-core8",
-  "version": "0.0.515",
+  "version": "0.0.518",
   "description": "ywana-core8",
   "homepage": "https://ywana.github.io/workspace",
   "author": "Ernesto Roldan Garcia",

package/src/domain/CollectionPage.js

@@ -22,7 +22,7 @@ export const CollectionPage = (props) => {
         actions = [], onSelect,
         canFilter = false, canAdd = false, canDelete = false, canEdit = false,
         autosave = false, delay = 1000, 
-        groupBy, levels, 
+        groupBy, levels, sorter,
         editor, 
         children 
     } = props
@@ -68,7 +68,7 @@ export const CollectionPage = (props) => {
                 <Header title={<Text>Lista de {name}</Text>} >
                 </Header>
                 {canFilter ? <CollectionFilters schema={schema}/> : null }
-                {levels ? <CollectionTree levels={levels} onSelect={onSelect}/> : <CollectionList groupBy={groupBy} onSelect={onSelect}/>}
+                {levels ? <CollectionTree levels={levels} onSelect={onSelect} sorter={sorter}/> : <CollectionList groupBy={groupBy} onSelect={onSelect}/>}
             </menu>
             <main key={id} className="collection-page">
                 <CollectionEditor icon={icon} schema={schema} layout={editor} autosave={autosave} delay={delay} />
@@ -166,7 +166,7 @@ const CollectionList = (props) => {
  */
 export const CollectionTree = (props) => {
 
-    const { levels, onSelect } = props
+    const { levels, onSelect, sorter } = props
     const [pageContext, setPageContext] = useContext(PageContext)
     const { all = [] } = pageContext
 
@@ -213,7 +213,8 @@ export const CollectionTree = (props) => {
         })
     }
 
-    const nodes = generateNodes(levels, all)
+    const items = sorter ? sorter(all) : all
+    const nodes = generateNodes(levels, items)
     return (
         <main>
             <Tree>

package/src/widgets/planner/Planner.css

@@ -43,6 +43,11 @@
     width: var(--column-width);
     background-color: var(--paper-color);
     height: 2.6rem;
+    border: solid 3px red;
+}
+
+.thisWeek {
+    background-color: red;
 }
 
 .date-header {

package/src/widgets/planner/Planner.js

@@ -1,5 +1,5 @@
 import React, { useEffect, useMemo, useState } from "react";
-import { DropDown, Header, Icon, Text, TextField } from "../../html";
+import { DropDown, Header, Icon, Text, TextField, Button } from "../../html";
 import moment from "moment";
 import { extendMoment } from "moment-range";
 import "./Planner2.css";
@@ -21,6 +21,10 @@ export const Planner = ({ title, events = [], lanes = [], navigation = true, onS
     const [from, setFrom] = useState(config.from);
     const [to, setTo] = useState(config.to);
 
+    useEffect(() => {
+        showThisWeek()
+    }, [])
+
     useEffect(() => {
         const element = document.getElementById(focusEvent)
         if (element) element.scrollIntoView({
@@ -60,6 +64,15 @@ export const Planner = ({ title, events = [], lanes = [], navigation = true, onS
         if (onSelectCell) onSelectCell(lane, date);
     }
 
+    function showThisWeek() {
+        const element = document.querySelector(".thisMonday")
+        if (element) element.scrollIntoView({
+            behavior: 'smooth',
+            block: 'start',
+            inline: 'start'
+        })
+    }
+
     const period = useMemo(() => {
         const start = ranges(from, "YYYY-MM-DD");
         const end = ranges(to, "YYYY-MM-DD");
@@ -79,6 +92,8 @@ export const Planner = ({ title, events = [], lanes = [], navigation = true, onS
 
             {navigation ? (
                 <Header title={label}>
+                    &nbsp;&nbsp;
+                    <Button label="Esta Semana" outlined action={showThisWeek}/>
                     <Icon icon="chevron_right" clickable action={next} />
                     <TextField id="to" type="date" label="To" value={to} onChange={(id, value) => setTo(value)} />
                     <div className="expand"></div>
@@ -117,9 +132,10 @@ export const Planner = ({ title, events = [], lanes = [], navigation = true, onS
                         {period.map((date) => {
                             const isWekend = [0, 6].includes(date.moment.day());
                             const weekend = isWekend ? "weekend" : "";
+                            const thisWeek = moment().startOf('week').isSame(date.moment, "week") ? "thisWeek" : "";
                             return (
                                 <div className="column-header">
-                                    <div className={`date-header ${weekend}`}>
+                                    <div className={`date-header ${weekend} ${thisWeek}`}>
                                         <Text use="headline6">{date.moment.format("DD")}</Text>
                                         &nbsp;
                                         <Text use="caption">{date.moment.format("ddd")}</Text>
@@ -206,9 +222,13 @@ const PlannerCell = ({ lane, events, date, disabled = false, onAdd, onDelete, on
 
     const isWekend = [0, 6].includes(date.moment.day());
     const weekend = isWekend ? "weekend" : "";
+
+    const today = moment()
+    var weekStart = today.clone().startOf('week')
+    const thisMonday = (date.moment.isSame(weekStart)) ? "thisMonday" : ""
     const dragOverStyle = dragOver ? "drag-over" : ""
      return (
-        <div className={`cell ${weekend} ${dragOverStyle}`} onDragOver={onDragOver} onDragLeave={onDragLeave} onDrop={drop} onClick={select}>
+        <div className={`cell ${thisMonday} ${weekend} ${dragOverStyle}`} onDragOver={onDragOver} onDragLeave={onDragLeave} onDrop={drop} onClick={select}>
             {events.map(event => {
                 const { Renderer = EventCard } = event
                 return <Renderer key={event.id} event={event} />

package/src/widgets/planner/Planner.test.js

@@ -49,8 +49,8 @@ const PlannerTest = (prop) => {
             lanes={lanes} 
             events={events} 
             navigation={true} 
-            onSelectCell={console.log} 
-            focusEvent={event}
+            onSelectCell={console.log}
+       
             onChange={(data) => console.log('D&D', data)}
         >
 

package/src/widgets/planner/Planner2.css

@@ -38,6 +38,13 @@
   border-bottom: solid 1px var(--divider-color);
 }
 
+.planner .date-header.thisWeek {
+  background-color: rgb(10, 176, 35);
+  border-radius: 3px;
+  padding: .2rem;
+  color: var(--paper-color);
+}
+
 .planner .row-header {
   width: var(--column-width);
   background-color: var(--paper-color);