Compare commits
No commits in common. "8a1a7d19b557fa9628a6fb7985fbfacfc435ad55" and "5e0793c7fcaebc863af89bee980cdde37692916e" have entirely different histories.
8a1a7d19b5
...
5e0793c7fc
BIN
data/data.xlsx
BIN
data/data.xlsx
Binary file not shown.
|
|
@ -1,55 +0,0 @@
|
|||
<?php
|
||||
require $_SERVER['DOCUMENT_ROOT'] . '/spreadSheetReader/read_write_xlsx.php';
|
||||
$fileName = $_SERVER['DOCUMENT_ROOT'] . '/data/data.xlsx';
|
||||
function objectToArray($object, $fullJSON) {
|
||||
return [$object -> id,
|
||||
$object -> lastSave,
|
||||
$fullJSON,
|
||||
$object -> timeWatchM,
|
||||
$object -> timeWatchW,
|
||||
$object -> timeWatchD,
|
||||
$object -> countWatchM,
|
||||
$object -> countWatchW,
|
||||
$object -> countWatchD];
|
||||
}
|
||||
|
||||
function findRowIndex($id, $data) {
|
||||
$rowCounter = -1;
|
||||
foreach ($data as $row) {
|
||||
$rowCounter ++;
|
||||
if($row[0] == $id) {
|
||||
return $rowCounter;
|
||||
}
|
||||
}
|
||||
return $rowCounter + 1;
|
||||
}
|
||||
|
||||
$entityBody = '{"lastSave": 0, "timeWatchM": 0, "timeWatchW": 0, "timeWatchD": 0, "countWatchM": 0, "countWatchW": 0, "countWatchD": 0, "id":"test","watches":[{"actions":[]},{"actions":[]},{"actions":[]}]}';
|
||||
if ($_SERVER['REQUEST_METHOD'] !== 'POST') {
|
||||
$entityBody = file_get_contents('php://input');
|
||||
$entityBodyObject = json_decode($entityBody);
|
||||
|
||||
echo "POST Request received.<br>";
|
||||
|
||||
if(property_exists($entityBodyObject, "id")) {
|
||||
$data = read_xls_file($fileName);
|
||||
|
||||
foreach ($data as $row) {
|
||||
echo "new Row: <br>";
|
||||
foreach ($row as $cell) {
|
||||
echo $cell." ";
|
||||
}
|
||||
}
|
||||
|
||||
$rowIndex = findRowIndex($entityBodyObject->id, $data);
|
||||
$data[$rowIndex] = objectToArray($entityBodyObject, $entityBody);
|
||||
write_xlsxFile($fileName, $data);
|
||||
echo "<br>Data saved.<br>";
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
280
index.html
280
index.html
|
|
@ -1,142 +1,140 @@
|
|||
<html lang="de">
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<link rel="stylesheet" href="css/custom.css">
|
||||
<link rel="stylesheet" href="css/bootstrap.css">
|
||||
<title>Genderwatch-protocol</title>
|
||||
|
||||
</head>
|
||||
<body>
|
||||
<section>
|
||||
<div class="container">
|
||||
<h1>Genderwatch-protocol</h1>
|
||||
<a href="data/data.xlsx">Anonyme Daten herunterladen</a>
|
||||
<h2 style="margin-left: 10px;">Aktuelles Thema</h2>
|
||||
<table class="table-bordered">
|
||||
<tr>
|
||||
<td colspan="2">
|
||||
<input class="form-control" type="text" id="topicInput" placeholder="Thema hier eingeben">
|
||||
</td>
|
||||
<td>
|
||||
<button class="" onclick="closeTopic()">
|
||||
Thema abschliessen
|
||||
</button>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>
|
||||
M
|
||||
</th>
|
||||
<th>
|
||||
W
|
||||
</th>
|
||||
<th>
|
||||
D
|
||||
</th>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td id="time-0">
|
||||
0
|
||||
</td>
|
||||
<td id="time-1">
|
||||
0
|
||||
</td>
|
||||
<td id="time-2">
|
||||
0
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td id="count-0">
|
||||
0
|
||||
</td>
|
||||
<td id="count-1">
|
||||
0
|
||||
</td>
|
||||
<td id="count-2">
|
||||
0
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>
|
||||
<button class="" onclick="start(0)">Beginnt zu Reden</button>
|
||||
</td>
|
||||
<td>
|
||||
<button class="" onclick="start(1)">Beginnt zu Reden</button>
|
||||
</td>
|
||||
<td>
|
||||
<button class="" onclick="start(2)">Beginnt zu Reden</button>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan="3">
|
||||
<button class="" style="width: 98%;" onclick="stop()">Hört auf zu Reden, -> Stille</button>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan="3">
|
||||
<button class="" style="width: 98%;" onclick="resetButton()">Reset</button>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
|
||||
|
||||
</div>
|
||||
|
||||
<div class="container">
|
||||
|
||||
|
||||
<H2>Abgeschlossene Themen</H2>
|
||||
<button class="" onclick="buttonDeleteAllClosedTopics()">alle Löschen</button>
|
||||
<table class="table-bordered">
|
||||
<thead>
|
||||
<tr>
|
||||
<th style="min-width: 100px;">
|
||||
Thema
|
||||
</th>
|
||||
<th style="min-width: 100px;">
|
||||
M
|
||||
</th>
|
||||
<th style="min-width: 100px;">
|
||||
W
|
||||
</th>
|
||||
<th style="min-width: 100px;">
|
||||
D
|
||||
</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody id="closedTopicsTable">
|
||||
|
||||
</tbody>
|
||||
|
||||
|
||||
|
||||
</table>
|
||||
|
||||
</div>
|
||||
</section>
|
||||
|
||||
|
||||
<script src="js/functions.js"></script>
|
||||
<script>
|
||||
closedTopics = JSON.parse(localStorage.getItem("closedTopics"))
|
||||
if(!closedTopics) {
|
||||
closedTopics = []
|
||||
}
|
||||
|
||||
actualTopic = JSON.parse(localStorage.getItem("actualTopic"))
|
||||
if(!actualTopic) {
|
||||
initializeNewTopic()
|
||||
}
|
||||
document.getElementById("topicInput").value = actualTopic.name
|
||||
|
||||
document.getElementById("topicInput").addEventListener('keyup', saveActualTopicName);
|
||||
refreshClosedTopics()
|
||||
setInterval(() => {
|
||||
refreshWatch(0)
|
||||
refreshWatch(1)
|
||||
refreshWatch(2)
|
||||
}, 100);
|
||||
</script>
|
||||
</body>
|
||||
<html>
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<link rel="stylesheet" href="css/custom.css">
|
||||
<link rel="stylesheet" href="css/bootstrap.css">
|
||||
|
||||
</head>
|
||||
<body>
|
||||
<section>
|
||||
<div class="container">
|
||||
<h1>Genderwatch-protocol</h1>
|
||||
<h2 style="margin-left: 10px;">Aktuelles Thema</h2>
|
||||
<table class="table-bordered">
|
||||
<tr>
|
||||
<td colspan="2">
|
||||
<input class="form-control" type="text" id="topicInput" placeholder="Thema hier eingeben">
|
||||
</td>
|
||||
<td>
|
||||
<button class="" onclick="closeTopic()">
|
||||
Thema abschliessen
|
||||
</button>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>
|
||||
M
|
||||
</th>
|
||||
<th>
|
||||
W
|
||||
</th>
|
||||
<th>
|
||||
D
|
||||
</th>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td id="time-0">
|
||||
0
|
||||
</td>
|
||||
<td id="time-1">
|
||||
0
|
||||
</td>
|
||||
<td id="time-2">
|
||||
0
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td id="count-0">
|
||||
0
|
||||
</td>
|
||||
<td id="count-1">
|
||||
0
|
||||
</td>
|
||||
<td id="count-2">
|
||||
0
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>
|
||||
<button class="" onclick="start(0)">Beginnt zu Reden</button>
|
||||
</td>
|
||||
<td>
|
||||
<button class="" onclick="start(1)">Beginnt zu Reden</button>
|
||||
</td>
|
||||
<td>
|
||||
<button class="" onclick="start(2)">Beginnt zu Reden</button>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan="3">
|
||||
<button class="" style="width: 98%;" onclick="stop()">Hört auf zu Reden, -> Stille</button>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan="3">
|
||||
<button class="" style="width: 98%;" onclick="resetButton()">Reset</button>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
|
||||
|
||||
</div>
|
||||
|
||||
<div class="container">
|
||||
|
||||
|
||||
<H2>Abgeschlossene Themen</H2>
|
||||
<button class="" onclick="buttonDeleteAllClosedTopics()">alle Löschen</button>
|
||||
<table class="table-bordered">
|
||||
<thead>
|
||||
<tr>
|
||||
<th style="min-width: 100px;">
|
||||
Thema
|
||||
</th>
|
||||
<th style="min-width: 100px;">
|
||||
M
|
||||
</th>
|
||||
<th style="min-width: 100px;">
|
||||
W
|
||||
</th>
|
||||
<th style="min-width: 100px;">
|
||||
D
|
||||
</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody id="closedTopicsTable">
|
||||
|
||||
</tbody>
|
||||
|
||||
|
||||
|
||||
</table>
|
||||
|
||||
</div>
|
||||
</section>
|
||||
|
||||
|
||||
<script src="js/functions.js"></script>
|
||||
<script>
|
||||
closedTopics = JSON.parse(localStorage.getItem("closedTopics"))
|
||||
if(!closedTopics) {
|
||||
closedTopics = []
|
||||
}
|
||||
|
||||
watches = JSON.parse(localStorage.getItem("watches"))
|
||||
if(!watches){
|
||||
reset()
|
||||
}
|
||||
|
||||
document.getElementById("topicInput").value = localStorage.getItem("actualTopic")
|
||||
document.getElementById("topicInput").addEventListener('keyup', saveActualTopicToLocalStorage);
|
||||
refreshClosedTopics()
|
||||
setInterval(() => {
|
||||
refreshWatch(0)
|
||||
refreshWatch(1)
|
||||
refreshWatch(2)
|
||||
}, 100);
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
|
|
@ -1,12 +1,6 @@
|
|||
function initializeNewTopic() {
|
||||
actualTopic = {"name": "", "id": randomId()}
|
||||
reset()
|
||||
document.getElementById("topicInput").value = actualTopic.name
|
||||
}
|
||||
|
||||
function reset() {
|
||||
actualTopic.watches = [{"actions": []}, {"actions": []}, {"actions": []}]
|
||||
saveActualTopic()
|
||||
saveWatchesToLocalStorage()
|
||||
}
|
||||
|
||||
function resetButton() {
|
||||
|
|
@ -18,7 +12,7 @@ function resetButton() {
|
|||
function buttonDeleteAllClosedTopics() {
|
||||
if(confirm("Sollen alle abgeschlossenen Themen gelöscht werden?")) {
|
||||
closedTopics = []
|
||||
saveClosedTopics()
|
||||
saveClosedTopicsToLocalStorage()
|
||||
refreshClosedTopics()
|
||||
}
|
||||
}
|
||||
|
|
@ -30,9 +24,8 @@ function buttonDeleteClosedTopic(topicIndex) {
|
|||
}
|
||||
|
||||
function closeTopic() {
|
||||
stop()
|
||||
let defaultname = "Thema"
|
||||
let name = actualTopic.name
|
||||
let name = document.getElementById("topicInput").value
|
||||
let nameLessCounter = 1
|
||||
while(!name){
|
||||
let foundName = false
|
||||
|
|
@ -47,50 +40,53 @@ function closeTopic() {
|
|||
name = defaultname + nameLessCounter
|
||||
}
|
||||
}
|
||||
actualTopic.name = name
|
||||
closedTopics.push(actualTopic)
|
||||
saveClosedTopics()
|
||||
|
||||
closedTopics.push({"name": name, "watches": watches})
|
||||
stop()
|
||||
reset()
|
||||
document.getElementById("topicInput").value = ""
|
||||
saveActualTopicToLocalStorage()
|
||||
saveClosedTopicsToLocalStorage()
|
||||
refreshClosedTopics()
|
||||
initializeNewTopic()
|
||||
}
|
||||
|
||||
function deleteTopic(topicIndex) {
|
||||
closedTopics = closedTopics.slice(0, topicIndex).concat(closedTopics.slice(topicIndex+1))
|
||||
saveClosedTopics()
|
||||
saveClosedTopicsToLocalStorage()
|
||||
refreshClosedTopics()
|
||||
}
|
||||
|
||||
function reopenTopic(topicIndex) {
|
||||
if(actualTopic.watches[0]["actions"]["length"] > 0 || actualTopic.watches[1]["actions"]["length"] > 0 ||actualTopic.watches[2]["actions"]["length"] > 0 || actualTopic.name !== "") {
|
||||
if(watches[0]["actions"]["length"] > 0 || watches[1]["actions"]["length"] > 0 ||watches[2]["actions"]["length"] > 0 || document.getElementById("topicInput").value != "") {
|
||||
closeTopic()
|
||||
}
|
||||
actualTopic = closedTopics[topicIndex]
|
||||
document.getElementById("topicInput").value = actualTopic.name
|
||||
watches = closedTopics[topicIndex]["watches"]
|
||||
document.getElementById("topicInput").value = closedTopics[topicIndex]["name"]
|
||||
deleteTopic(topicIndex)
|
||||
saveClosedTopics()
|
||||
saveActualTopic()
|
||||
saveWatchesToLocalStorage()
|
||||
saveActualTopicToLocalStorage()
|
||||
}
|
||||
|
||||
function start(watchIndex) {
|
||||
stop()
|
||||
actualTopic.watches[watchIndex].actions.push({"type": "start", "time": new Date().getTime()})
|
||||
saveActualTopic()
|
||||
watches[watchIndex].actions.push({"type": "start", "time": new Date().getTime()})
|
||||
saveWatchesToLocalStorage()
|
||||
}
|
||||
|
||||
function stop() {
|
||||
actualTopic.watches.forEach(watch => {
|
||||
watches.forEach(watch => {
|
||||
if(watch["actions"]["length"] > 0) {
|
||||
if(watch["actions"]["length"] % 2 === 1){
|
||||
if(watch["actions"]["length"] % 2 == 1){
|
||||
watch["actions"].push({"type": "stop", "time": new Date().getTime()})
|
||||
}
|
||||
}
|
||||
});
|
||||
saveActualTopic()
|
||||
saveWatchesToLocalStorage()
|
||||
}
|
||||
|
||||
function calcPercForWatch(watchIndex, topic) {
|
||||
let sumAll = sumAllwatches(topic)
|
||||
if(sumAll === 0) {
|
||||
if(sumAll == 0) {
|
||||
return 0
|
||||
}
|
||||
return Math.round(sumForWatch(topic.watches[watchIndex]) / sumAllwatches(topic) * 100)
|
||||
|
|
@ -116,7 +112,7 @@ function countForWatch(watch) {
|
|||
|
||||
function calcPercCountForWatch(watchindex, topic) {
|
||||
let sumAll = sumCountAllWatches(topic)
|
||||
if(sumAll === 0) {
|
||||
if(sumAll == 0) {
|
||||
return 0
|
||||
}
|
||||
return Math.round(countForWatch(topic.watches[watchindex]) / sumAll * 100)
|
||||
|
|
@ -136,14 +132,14 @@ function timeToISO(time){
|
|||
|
||||
function refreshWatch(watchIndex) {
|
||||
let timeCell = document.getElementById("time-" + watchIndex)
|
||||
timeCell.textContent = timeToISO(sumForWatch(actualTopic.watches[watchIndex]))
|
||||
if(actualTopic.watches[watchIndex]["actions"].length !== 0 && actualTopic.watches[watchIndex]["actions"].slice(-1)[0]["type"] === "start"){
|
||||
timeCell.textContent = timeToISO(sumForWatch(watches[watchIndex]))
|
||||
if(watches[watchIndex]["actions"].length != 0 && watches[watchIndex]["actions"].slice(-1)[0]["type"] == "start"){
|
||||
timeCell.classList.add("active")
|
||||
} else {
|
||||
timeCell.classList.remove("active")
|
||||
}
|
||||
let countCell = document.getElementById("count-" + watchIndex)
|
||||
countCell.textContent = countForWatch(actualTopic.watches[watchIndex]) + " Wortmeldungen"
|
||||
countCell.textContent = countForWatch(watches[watchIndex]) + " Wortmeldungen"
|
||||
}
|
||||
|
||||
function refreshClosedTopics() {
|
||||
|
|
@ -182,20 +178,15 @@ function refreshClosedTopics() {
|
|||
}
|
||||
}
|
||||
|
||||
function saveActualTopicName() {
|
||||
actualTopic.name = document.getElementById("topicInput").value
|
||||
saveActualTopic()
|
||||
function saveWatchesToLocalStorage() {
|
||||
localStorage.setItem("watches", JSON.stringify(watches))
|
||||
}
|
||||
|
||||
|
||||
|
||||
function saveActualTopic() {
|
||||
//save it to LocalStorage
|
||||
localStorage.setItem("actualTopic", JSON.stringify(actualTopic))
|
||||
function saveActualTopicToLocalStorage() {
|
||||
localStorage.setItem("actualTopic", document.getElementById("topicInput").value)
|
||||
}
|
||||
|
||||
function saveClosedTopics() {
|
||||
//save it to LocalStorage
|
||||
function saveClosedTopicsToLocalStorage() {
|
||||
localStorage.setItem("closedTopics", JSON.stringify(closedTopics))
|
||||
}
|
||||
|
||||
|
|
@ -211,10 +202,4 @@ function elt (type, attrs, ...children) {
|
|||
else node.appendChild(document.createTextNode(child))
|
||||
}
|
||||
return node
|
||||
}
|
||||
|
||||
// random.ts
|
||||
function randomId() {
|
||||
const uint32 = window.crypto.getRandomValues(new Uint32Array(1))[0];
|
||||
return uint32.toString(16);
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
|
@ -1,19 +0,0 @@
|
|||
<?php
|
||||
require $_SERVER['DOCUMENT_ROOT'] . '/spreadSheetReader/SimpleXLSX.php';
|
||||
require $_SERVER['DOCUMENT_ROOT'] . '/spreadSheetReader/SimpleXLSXGen.php';
|
||||
function read_xls_file($filename){
|
||||
$fileContent = [];
|
||||
if ($xlsx = SimpleXLSX::parse($filename)) {
|
||||
$fileContent = ($xlsx->rows());
|
||||
} else {
|
||||
echo SimpleXLSX::parseError();
|
||||
}
|
||||
return $fileContent;
|
||||
}
|
||||
|
||||
|
||||
|
||||
function write_xlsxFile($filename, $data) {
|
||||
$xlsx = SimpleXLSXGen::fromArray($data);
|
||||
$xlsx->saveAs($filename);
|
||||
}
|
||||
Loading…
Reference in New Issue