{stringTime(props[i].repTime)+" of "+ recTime_today(props,i) }
) //myData[i].value+'h'
+ children.push(
{props[i].id}
)
+ children.push(
{stringTime(props[i].repTime)+" of "+ recTime_today(props,i) }
) //myData[i].value+'h'
//Create a parent and add it's children
table.push(
{children}
)
@@ -175,7 +175,7 @@ function DonutSite(props){
HELP
-
+
To do List
-centera meny √ -skriva text till help -hitta på namn -footer swipe
To do List
@@ -236,7 +236,7 @@ function DonutSite(props){
return (
-
+
{/*
*/}
@@ -248,24 +248,6 @@ function DonutSite(props){
To achive your goal, study these hours
-
-
- {/*Menu Button*/}
-
-
-
-
-
-
-
-
- {/*Menu List*/}
-
-
-
-
-
-
{/*Question Button*/}
@@ -278,11 +260,11 @@ function DonutSite(props){
{questionText()}
- {/**/}
+ {/*Donutgeneration*/}
-
Study
-
{recTime(props.data)}
+
Study
+
{recTime(props.data)}
-
+
{createTable(props.data)}
+
+
+
<
+
+
+ {/*Footer*/}
+
+
Bottom Header
+
);
diff --git a/FormSite.js b/FormSite.js
index b55bc7e..67cfc2b 100644
--- a/FormSite.js
+++ b/FormSite.js
@@ -35,8 +35,8 @@ function colour(){
var props = loadData();
let arrayFromStorage = JSON.parse(localStorage.getItem("data"));
var colorCounter = props.length;
- //console.log(colorCounter)
- //console.log('colorCounter');
+ console.log(colorCounter)
+ console.log('colorCounter');
let colour1 = "white";
var mod = colorCounter % 5;
@@ -61,36 +61,32 @@ function colour(){
colorCounter= colorCounter+1;
- //console.log(colorCounter);
+ console.log(colorCounter);
return colour1;
}
function fixObject (a, b, c, d, e) {
- console.log("SKriver denna ut något")
console.log(a)
if (a === ""){
a = "NoName"
- // console.log("NoName achived")
+ console.log("NoName achived")
}
- if(b === ""){
+ if(b == ""){
b = "12/11/2019"
}
- if(c === ""){
+ if(c == ""){
c = "12/24/2020"
}
- console.log(d);
- console.log(e);
+
let TotTime = (Number(d)*60) + Number(e);
let g = String(0); //reptime
let f = String(TotTime);
- const Course = {id: a, startDate: b, endDate: c, totTime: f, repTime: g, repTodayTime: "0", color: colour(), colorCounter: "0" };
- console.log("courses");
- console.log(Course);
+ const Course = {id: a, startDate: b, endDate: c, totTime: f, repTime: g, repTodayTime: "0", color: colour()};
+
addtoList(Course);
-
}
@@ -115,16 +111,16 @@ function clearList(){
//App är form
function App(props) { // props eller inte props??
- // console.log("vad får vi in??");
- //console.log(props);
- //console.log("Fick vi");
+ console.log("vad får vi in??");
+ console.log(props);
+ console.log("Fick vi");
const [name, setCoursName] = useState('');
const [startDate, setStartDate] = useState(0);
const [endDate, setEndDate] = useState(0);
- const [hours, setHours] = useState(0);
+ const [hours, setHours] = useState(2);
const [min, setMin] = useState(0);
- //console.log(props);
+
function changeInput(event){
if(event.target.id === "name"){
@@ -162,51 +158,61 @@ function App(props) { // props eller inte props??
-
+
+
Activity Name
+
Start Date
-
+
End Date
-
+
+
Set time:
-
- {/*Obs ändra plats på id=hours och id=hh om det ej funkar!!! samma för min!!*/}
-
-
h
-
-
m
+
+
h
+
+
m
-
-
-
-
-
-
-
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+ {/*Footer*/}
+
+
Bottom Header
+
+
);
}
-export default Parent;//ska det vara parent eller app här?
+export default Parent;//ska det vara parent eller app här?
\ No newline at end of file
diff --git a/ReportTime.js b/ReportTime.js
index 64a6faf..bed0ae3 100644
--- a/ReportTime.js
+++ b/ReportTime.js
@@ -1,3 +1,4 @@
+import { BrowserRouter as Router, Switch, Route, Link } from "react-router-dom";
import './App.css';
import { useState } from 'react';
import React, { Component } from 'react';
@@ -27,34 +28,22 @@ function ReportTime(){
}
function fixObject (d, e) {
- console.log(d);
- console.log(e);
-
let g = (Number(d)*60) + Number(e);
- console.log(g);
- //let g = String(0); //reptime
- //let f = String(TotTime);
- //const Course = {repTime: g };
-
- //addtoList(Course);
- // console.log(Course);
-
- var A = loadData();
- console.log("Snart mat");
- console.log(A);
- console.log("Pizza");
-
- A[0].repTime = Number(A[0].repTime) + g;
-
- console.log(A);
- saveData(A);
+ var A = loadData();
- }
+ // Här behöver vi veta vilken slot i arrayen som kursen som ska raporteras är
+ /*
+ A[0].repTime = Number(A[0].repTime) + g;
+
+ saveData(A);
+ */
+ }
+// addtolist kan vara en hellt onödig här
function addtoList(courseToAdd){
localData.push(courseToAdd);
setData(localData);
@@ -80,7 +69,7 @@ function ReportTime(){
// main component of app is always one page (depending on url path) + Menu below
-//redirect === false &&
+
return(