diff --git a/package.json b/package.json index a076a8b..4322c4b 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "Spritzschema", "version": "1.1.0", - "date": "2023-05-13", + "date": "2023-05-14", "private": true, "scripts": { "start": "node ./bin/www >>/var/log/spritzschema.log 2>&1" diff --git a/public/javascripts/script.js b/public/javascripts/script.js index 4187747..43cbb99 100644 --- a/public/javascripts/script.js +++ b/public/javascripts/script.js @@ -2,8 +2,7 @@ document.addEventListener('DOMContentLoaded', async function () { const DateTime = luxon.DateTime - const DEFEINHEIT = 8 - let curEinheit = 0 + let curEinheit = sysParams.einheit if (sysParams.doinit) { await initSchema('2023-05-01') @@ -22,7 +21,9 @@ document.addEventListener('DOMContentLoaded', async function () { field.setAttribute('aria-label','x'); field.setAttribute('disabled','disabled'); schema.data[parseInt(field.id.slice(2))-1].status = true + schema.data[parseInt(field.id.slice(2))-1].einheit = curEinheit await storeData(schema) + fillSchema(schema) if (e.srcElement.id === 'bt35') { let ldt = DateTime.fromISO(d) ldt = ldt.plus({day: 1}) @@ -32,16 +33,14 @@ document.addEventListener('DOMContentLoaded', async function () { async function enterEinheit (e) { let field = e.target; - let d = schema.data[34].day - schema.data[parseInt(field.id.slice(2))-1].einheit = field.value - await storeData(schema) + curEinheit = field.value } function buildCellHtml(day, einheit) { let x = `${day.toFormat('d')}
${day.setLocale('de').toFormat('ccc')}
-
${einheit !== 0 ? einheit : ''}
+
${einheit !== 0 ? einheit : ''}
` return x } @@ -105,7 +104,7 @@ document.addEventListener('DOMContentLoaded', async function () { let k = 0 for(let i = 0; i < 35; i++) { let elem = {status: false} - elem.einheit = curEinheit + elem.einheit = 0 if (i === 17) { elem.day = '' } else { diff --git a/public/stylesheets/style.css b/public/stylesheets/style.css index eca33c8..7844773 100644 --- a/public/stylesheets/style.css +++ b/public/stylesheets/style.css @@ -74,3 +74,7 @@ footer { display: flex; justify-content: space-between; } + +#eh { + color: black; +} \ No newline at end of file diff --git a/routes/index.js b/routes/index.js index d960381..ae2ff31 100644 --- a/routes/index.js +++ b/routes/index.js @@ -8,6 +8,7 @@ router.get('/', function(req, res, next) { res.render('index', { test: req.query.test === 'true', doinit: req.query.doinit === 'true', + einheit: req.query.einheit === undefined ? 0 : req.query.einheit, version: pkg.version, title: pkg.name, date: pkg.date diff --git a/views/layout.pug b/views/layout.pug index 14ec450..b1ffd83 100644 --- a/views/layout.pug +++ b/views/layout.pug @@ -30,7 +30,8 @@ html testing: '#{test}' === 'true', version: '#{version}', date: '#{date}', - doinit: '#{doinit}' === 'true' + doinit: '#{doinit}' === 'true', + einheit: parseInt('#{einheit}') }