From d8eaa98e3698c13e7514fd9dadfa57dc75132097 Mon Sep 17 00:00:00 2001 From: Frieder Hannenheim Date: Wed, 29 Jan 2025 14:57:00 +0100 Subject: [PATCH] basic notenrechner --- .gitignore | 4 ++ flake.nix | 1 + justfile | 10 +++-- src/index.html | 27 ++++------- src/rechner.ts | 82 ++++++++++++++++++++++++++++++++++ tsconfig.json | 111 ++++++++++++++++++++++++++++++++++++++++++++++ webpack.config.js | 9 ++++ 7 files changed, 223 insertions(+), 21 deletions(-) create mode 100644 tsconfig.json create mode 100644 webpack.config.js diff --git a/.gitignore b/.gitignore index 567609b..2e820de 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,5 @@ build/ +dist/ + +.envrc +.direnv/ diff --git a/flake.nix b/flake.nix index 3805d79..a722d8c 100644 --- a/flake.nix +++ b/flake.nix @@ -12,6 +12,7 @@ buildInputs = with pkgs; [ just toml2json + nodePackages.webpack-cli typescript typescript-language-server diff --git a/justfile b/justfile index 7941757..a5e9289 100644 --- a/justfile +++ b/justfile @@ -6,9 +6,13 @@ build: mkdir -p build cat src/data/* | toml2json > build/gewichtungen.json # typescript compilation depends on gewichtungen.json - tsc --outFile build/rechner.js src/rechner.ts - cp src/index.html build/index.html + tsc + mv src/rechner.js build/ + + webpack --mode development + cp src/index.html dist/index.html clean: - rm -rf ./build + rm -rf ./build ./dist + diff --git a/src/index.html b/src/index.html index eb500bf..6aaedfc 100644 --- a/src/index.html +++ b/src/index.html @@ -20,30 +20,21 @@ along with this program. If not, see . iFSR Notenrechner + -

Notenberechnungen

Hier könnt ihr Vordiploms- und Abschlussnoten ausgewählter Studiengänge der Fakultät Informatik der TU Dresden berechnen.

-

Informatik

- + + -

Medieninformatik

- - +
+
+
+ diff --git a/src/rechner.ts b/src/rechner.ts index 1e8cbf3..5c1a15b 100644 --- a/src/rechner.ts +++ b/src/rechner.ts @@ -16,3 +16,85 @@ import gewichtungen from '../build/gewichtungen.json' +var select = document.getElementById("options") as HTMLSelectElement; + +for (let key in gewichtungen) { + let option = document.createElement('option'); + option.value = key; + option.text = String(gewichtungen[key as keyof typeof gewichtungen].display_name); + select.add(option); +} +select.selectedIndex = 0; + +var noten = document.getElementById("noten") as HTMLFormElement; + +select.onchange = function changed() { + noten.innerHTML = ""; + let gewichtung_index = select.selectedOptions[0].value as keyof typeof gewichtungen; + let gewichtung = gewichtungen[gewichtung_index]; + + let table = document.createElement('table'); + for (let modulIndex in gewichtung.module) { + let modul = gewichtung.module[modulIndex]; + let label = document.createElement('label'); + let input = document.createElement('input'); + let row = table.insertRow(); + + + input.id = modul.short + "input"; + input.type = "number"; + input.required = true; + input.min = "1"; + input.max = "5"; + input.style.width = "70px"; + input.step = "0.1"; + input.addEventListener("input", () => { + // Validate with the built-in constraints + input.setCustomValidity(""); + if (!input.validity.valid) { + return; + } + + let note = parseFloat(input.value.replace(",", ".")); + if (note > 4) { + input.setCustomValidity("Keine Berechnung möglich bei nicht bestandenen Prüfungen (mit > 4.0)") + } + }); + + label.htmlFor = input.id; + label.textContent = modul.name; + + row.insertCell().appendChild(label); + row.insertCell().appendChild(input); + } + noten.appendChild(table); + + let submit = document.createElement('button'); + submit.type = "submit"; + submit.innerText = "Berechnen"; + + let result = document.createElement('p'); + + noten.appendChild(result); + noten.appendChild(submit); + + noten.onsubmit = function calculate(event) { + event.preventDefault(); + let sum = 0; + let credits = 0; + + for (let modulIndex in gewichtung.module) { + let modul = gewichtung.module[modulIndex]; + let noteInput = document.getElementById(modul.short + "input") as HTMLInputElement; + let noteString = noteInput.value; + let note = parseFloat(noteString.replace(",", ".")); + + sum += modul.lp * note; + credits += modul.lp; + } + + let endnote = Math.floor((sum / credits) * 10) / 10; + + result.innerText = "Deine Note: " + String(endnote); + } +} diff --git a/tsconfig.json b/tsconfig.json new file mode 100644 index 0000000..3e765c5 --- /dev/null +++ b/tsconfig.json @@ -0,0 +1,111 @@ +{ + "compilerOptions": { + /* Visit https://aka.ms/tsconfig to read more about this file */ + + /* Projects */ + // "incremental": true, /* Save .tsbuildinfo files to allow for incremental compilation of projects. */ + // "composite": true, /* Enable constraints that allow a TypeScript project to be used with project references. */ + // "tsBuildInfoFile": "./.tsbuildinfo", /* Specify the path to .tsbuildinfo incremental compilation file. */ + // "disableSourceOfProjectReferenceRedirect": true, /* Disable preferring source files instead of declaration files when referencing composite projects. */ + // "disableSolutionSearching": true, /* Opt a project out of multi-project reference checking when editing. */ + // "disableReferencedProjectLoad": true, /* Reduce the number of projects loaded automatically by TypeScript. */ + + /* Language and Environment */ + "target": "es2016", /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */ + // "lib": [], /* Specify a set of bundled library declaration files that describe the target runtime environment. */ + // "jsx": "preserve", /* Specify what JSX code is generated. */ + // "experimentalDecorators": true, /* Enable experimental support for legacy experimental decorators. */ + // "emitDecoratorMetadata": true, /* Emit design-type metadata for decorated declarations in source files. */ + // "jsxFactory": "", /* Specify the JSX factory function used when targeting React JSX emit, e.g. 'React.createElement' or 'h'. */ + // "jsxFragmentFactory": "", /* Specify the JSX Fragment reference used for fragments when targeting React JSX emit e.g. 'React.Fragment' or 'Fragment'. */ + // "jsxImportSource": "", /* Specify module specifier used to import the JSX factory functions when using 'jsx: react-jsx*'. */ + // "reactNamespace": "", /* Specify the object invoked for 'createElement'. This only applies when targeting 'react' JSX emit. */ + // "noLib": true, /* Disable including any library files, including the default lib.d.ts. */ + // "useDefineForClassFields": true, /* Emit ECMAScript-standard-compliant class fields. */ + // "moduleDetection": "auto", /* Control what method is used to detect module-format JS files. */ + + /* Modules */ + "module": "commonjs", /* Specify what module code is generated. */ + // "rootDir": "./", /* Specify the root folder within your source files. */ + // "moduleResolution": "node10", /* Specify how TypeScript looks up a file from a given module specifier. */ + // "baseUrl": "./", /* Specify the base directory to resolve non-relative module names. */ + // "paths": {}, /* Specify a set of entries that re-map imports to additional lookup locations. */ + // "rootDirs": [], /* Allow multiple folders to be treated as one when resolving modules. */ + // "typeRoots": [], /* Specify multiple folders that act like './node_modules/@types'. */ + // "types": [], /* Specify type package names to be included without being referenced in a source file. */ + // "allowUmdGlobalAccess": true, /* Allow accessing UMD globals from modules. */ + // "moduleSuffixes": [], /* List of file name suffixes to search when resolving a module. */ + // "allowImportingTsExtensions": true, /* Allow imports to include TypeScript file extensions. Requires '--moduleResolution bundler' and either '--noEmit' or '--emitDeclarationOnly' to be set. */ + // "rewriteRelativeImportExtensions": true, /* Rewrite '.ts', '.tsx', '.mts', and '.cts' file extensions in relative import paths to their JavaScript equivalent in output files. */ + // "resolvePackageJsonExports": true, /* Use the package.json 'exports' field when resolving package imports. */ + // "resolvePackageJsonImports": true, /* Use the package.json 'imports' field when resolving imports. */ + // "customConditions": [], /* Conditions to set in addition to the resolver-specific defaults when resolving imports. */ + // "noUncheckedSideEffectImports": true, /* Check side effect imports. */ + "resolveJsonModule": true, /* Enable importing .json files. */ + // "allowArbitraryExtensions": true, /* Enable importing files with any extension, provided a declaration file is present. */ + // "noResolve": true, /* Disallow 'import's, 'require's or ''s from expanding the number of files TypeScript should add to a project. */ + + /* JavaScript Support */ + // "allowJs": true, /* Allow JavaScript files to be a part of your program. Use the 'checkJS' option to get errors from these files. */ + // "checkJs": true, /* Enable error reporting in type-checked JavaScript files. */ + // "maxNodeModuleJsDepth": 1, /* Specify the maximum folder depth used for checking JavaScript files from 'node_modules'. Only applicable with 'allowJs'. */ + + /* Emit */ + // "declaration": true, /* Generate .d.ts files from TypeScript and JavaScript files in your project. */ + // "declarationMap": true, /* Create sourcemaps for d.ts files. */ + // "emitDeclarationOnly": true, /* Only output d.ts files and not JavaScript files. */ + // "sourceMap": true, /* Create source map files for emitted JavaScript files. */ + // "inlineSourceMap": true, /* Include sourcemap files inside the emitted JavaScript. */ + // "noEmit": true, /* Disable emitting files from a compilation. */ + // "outFile": "./", /* Specify a file that bundles all outputs into one JavaScript file. If 'declaration' is true, also designates a file that bundles all .d.ts output. */ + // "outDir": "./", /* Specify an output folder for all emitted files. */ + // "removeComments": true, /* Disable emitting comments. */ + // "importHelpers": true, /* Allow importing helper functions from tslib once per project, instead of including them per-file. */ + // "downlevelIteration": true, /* Emit more compliant, but verbose and less performant JavaScript for iteration. */ + // "sourceRoot": "", /* Specify the root path for debuggers to find the reference source code. */ + // "mapRoot": "", /* Specify the location where debugger should locate map files instead of generated locations. */ + // "inlineSources": true, /* Include source code in the sourcemaps inside the emitted JavaScript. */ + // "emitBOM": true, /* Emit a UTF-8 Byte Order Mark (BOM) in the beginning of output files. */ + // "newLine": "crlf", /* Set the newline character for emitting files. */ + // "stripInternal": true, /* Disable emitting declarations that have '@internal' in their JSDoc comments. */ + // "noEmitHelpers": true, /* Disable generating custom helper functions like '__extends' in compiled output. */ + // "noEmitOnError": true, /* Disable emitting files if any type checking errors are reported. */ + // "preserveConstEnums": true, /* Disable erasing 'const enum' declarations in generated code. */ + // "declarationDir": "./", /* Specify the output directory for generated declaration files. */ + + /* Interop Constraints */ + // "isolatedModules": true, /* Ensure that each file can be safely transpiled without relying on other imports. */ + // "verbatimModuleSyntax": true, /* Do not transform or elide any imports or exports not marked as type-only, ensuring they are written in the output file's format based on the 'module' setting. */ + // "isolatedDeclarations": true, /* Require sufficient annotation on exports so other tools can trivially generate declaration files. */ + // "allowSyntheticDefaultImports": true, /* Allow 'import x from y' when a module doesn't have a default export. */ + "esModuleInterop": true, /* Emit additional JavaScript to ease support for importing CommonJS modules. This enables 'allowSyntheticDefaultImports' for type compatibility. */ + // "preserveSymlinks": true, /* Disable resolving symlinks to their realpath. This correlates to the same flag in node. */ + "forceConsistentCasingInFileNames": true, /* Ensure that casing is correct in imports. */ + + /* Type Checking */ + "strict": true, /* Enable all strict type-checking options. */ + // "noImplicitAny": true, /* Enable error reporting for expressions and declarations with an implied 'any' type. */ + // "strictNullChecks": true, /* When type checking, take into account 'null' and 'undefined'. */ + // "strictFunctionTypes": true, /* When assigning functions, check to ensure parameters and the return values are subtype-compatible. */ + // "strictBindCallApply": true, /* Check that the arguments for 'bind', 'call', and 'apply' methods match the original function. */ + // "strictPropertyInitialization": true, /* Check for class properties that are declared but not set in the constructor. */ + // "strictBuiltinIteratorReturn": true, /* Built-in iterators are instantiated with a 'TReturn' type of 'undefined' instead of 'any'. */ + // "noImplicitThis": true, /* Enable error reporting when 'this' is given the type 'any'. */ + // "useUnknownInCatchVariables": true, /* Default catch clause variables as 'unknown' instead of 'any'. */ + // "alwaysStrict": true, /* Ensure 'use strict' is always emitted. */ + // "noUnusedLocals": true, /* Enable error reporting when local variables aren't read. */ + // "noUnusedParameters": true, /* Raise an error when a function parameter isn't read. */ + // "exactOptionalPropertyTypes": true, /* Interpret optional property types as written, rather than adding 'undefined'. */ + // "noImplicitReturns": true, /* Enable error reporting for codepaths that do not explicitly return in a function. */ + // "noFallthroughCasesInSwitch": true, /* Enable error reporting for fallthrough cases in switch statements. */ + // "noUncheckedIndexedAccess": true, /* Add 'undefined' to a type when accessed using an index. */ + // "noImplicitOverride": true, /* Ensure overriding members in derived classes are marked with an override modifier. */ + // "noPropertyAccessFromIndexSignature": true, /* Enforces using indexed accessors for keys declared using an indexed type. */ + // "allowUnusedLabels": true, /* Disable error reporting for unused labels. */ + // "allowUnreachableCode": true, /* Disable error reporting for unreachable code. */ + + /* Completeness */ + // "skipDefaultLibCheck": true, /* Skip type checking .d.ts files that are included with TypeScript. */ + "skipLibCheck": true /* Skip type checking all .d.ts files. */ + } +} diff --git a/webpack.config.js b/webpack.config.js new file mode 100644 index 0000000..a900d58 --- /dev/null +++ b/webpack.config.js @@ -0,0 +1,9 @@ +const path = require('path'); + +module.exports = { + entry: './build/rechner.js', + output: { + path: path.resolve(__dirname, 'dist'), + filename: 'rechner.js', + }, +};