Merge pull request #27 from bbwheroes/feature/fachrichtung_und_projektmethode

jannismilz · web-flow · commit d3bed68aa658 · 2026-01-18T22:31:05.000+01:00
Fachrichtung und Projektmethode
diff --git a/backend/Dockerfile b/backend/Dockerfile
@@ -26,4 +26,4 @@ WORKDIR /app/backend
 
 EXPOSE 3000
 
-CMD ["bun", "run", "src/index.js"]
+CMD ["sh", "-c", "bun run src/db/migrate.js && bun run src/index.js"]
diff --git a/backend/src/db/migrate.js b/backend/src/db/migrate.js
@@ -17,10 +17,24 @@ async function migrate() {
         first_name VARCHAR(100),
         last_name VARCHAR(100),
         topic TEXT,
-        submission_date DATE
+        submission_date DATE,
+        specialty VARCHAR(50),
+        project_method VARCHAR(20)
       )
     `;
 
+    await sql`
+      DO $$ 
+      BEGIN
+        IF NOT EXISTS (SELECT 1 FROM information_schema.columns WHERE table_name = 'user_profiles' AND column_name = 'specialty') THEN
+          ALTER TABLE user_profiles ADD COLUMN specialty VARCHAR(50);
+        END IF;
+        IF NOT EXISTS (SELECT 1 FROM information_schema.columns WHERE table_name = 'user_profiles' AND column_name = 'project_method') THEN
+          ALTER TABLE user_profiles ADD COLUMN project_method VARCHAR(20);
+        END IF;
+      END $$;
+    `;
+
     await sql`
       CREATE TABLE IF NOT EXISTS ticked_requirements (
         id SERIAL PRIMARY KEY,
diff --git a/backend/src/middleware/auth.js b/backend/src/middleware/auth.js
@@ -28,8 +28,7 @@ export const optionalAuth = async (req, res, next) => {
     try {
       const decoded = jwt.verify(token, JWT_SECRET);
       req.userId = decoded.userId;
-    } catch (error) {
-      console.error('Invalid token:', error);
+    } catch {
       req.userId = null;
     }
   }
diff --git a/backend/src/routes/users.js b/backend/src/routes/users.js
@@ -13,6 +13,8 @@ router.get('/profile', authMiddleware, async (req, res) => {
         up.last_name,
         up.topic,
         up.submission_date,
+        up.specialty,
+        up.project_method,
         up.user_id
       FROM user_profiles up
       WHERE up.user_id = ${req.userId}
@@ -30,7 +32,7 @@ router.get('/profile', authMiddleware, async (req, res) => {
 });
 
 router.put('/profile', authMiddleware, async (req, res) => {
-  const { firstName, lastName, topic, submissionDate } = req.body;
+  const { firstName, lastName, topic, submissionDate, specialty, projectMethod } = req.body;
 
   try {
     const [profile] = await sql`
@@ -39,7 +41,9 @@ router.put('/profile', authMiddleware, async (req, res) => {
         first_name = COALESCE(${firstName}, first_name),
         last_name = COALESCE(${lastName}, last_name),
         topic = COALESCE(${topic}, topic),
-        submission_date = COALESCE(${submissionDate}, submission_date)
+        submission_date = COALESCE(${submissionDate}, submission_date),
+        specialty = COALESCE(${specialty}, specialty),
+        project_method = COALESCE(${projectMethod}, project_method)
       WHERE user_id = ${req.userId}
       RETURNING *
     `;
diff --git a/backend/src/test/setup.js b/backend/src/test/setup.js
@@ -16,7 +16,9 @@ export async function setupTestDatabase() {
       first_name VARCHAR(100),
       last_name VARCHAR(100),
       topic TEXT,
-      submission_date DATE
+      submission_date DATE,
+      specialty VARCHAR(50),
+      project_method VARCHAR(20)
     )
   `;
 
diff --git a/criterias.json b/criterias.json
@@ -325,10 +325,10 @@
             "requirements": [
                 "Es wurde eine Beschreibung der Testinfrastruktur und des Umfelds bereitgestellt, sodass eine externe Fachperson die Tests mit gleichen Ergebnissen reproduzieren kann.",
                 "Verbesserungspotential wie auch Nacharbeiten wurden identifiziert. Falls weder Verbesserungspotential besteht noch Nacharbeit nötig ist, ist dies nachvollziehbar begründet.",
-                "Linear: Relevante Testszenarien wie auch Testkomponenten (bspw. Funktionen, Daten, Dokumente, Performance, Schnittstellen etc.) sind inkl. der erwarteten Ergebnisse beschrieben.",
-                "Linear: Die Tests wurden basierend auf den Testszenarien durchgeführt. Die Ergebnisse sind korrekt und übersichtlich dokumentiert.",
-                "Agil: Es existiert eine Definition of Done (DoD), die festlegt, welche Bedingungen erfüllt sein müssen, damit eine User Story oder ein Arbeitspaket als abgeschlossen gilt.",
-                "Agil: Die Tests wurden basierend auf der DoD durchgeführt. Die Ergebnisse sind korrekt und übersichtlich dokumentiert."
+                { "text": "Relevante Testszenarien wie auch Testkomponenten (bspw. Funktionen, Daten, Dokumente, Performance, Schnittstellen etc.) sind inkl. der erwarteten Ergebnisse beschrieben.", "projectMethod": "Linear" },
+                { "text": "Die Tests wurden basierend auf den Testszenarien durchgeführt. Die Ergebnisse sind korrekt und übersichtlich dokumentiert.", "projectMethod": "Linear" },
+                { "text": "Es existiert eine Definition of Done (DoD), die festlegt, welche Bedingungen erfüllt sein müssen, damit eine User Story oder ein Arbeitspaket als abgeschlossen gilt.", "projectMethod": "Agil" },
+                { "text": "Die Tests wurden basierend auf der DoD durchgeführt. Die Ergebnisse sind korrekt und übersichtlich dokumentiert.", "projectMethod": "Agil" }
             ],
             "stages": {
                 "3": {
diff --git a/frontend/src/App.css b/frontend/src/App.css
@@ -43,7 +43,7 @@ body {
 .main-content {
   flex: 1;
   padding: 2rem;
-  max-width: 1400px;
+  max-width: 1200px;
   margin: 0 auto;
   width: 100%;
 }
@@ -59,7 +59,7 @@ body {
 }
 
 .header-content {
-  max-width: 1200px;
+  max-width: 1000px;
   margin: 0 auto;
   padding: 1rem 2rem;
   display: flex;
@@ -335,7 +335,8 @@ button {
 }
 
 .form-group input,
-.form-group textarea {
+.form-group textarea,
+.form-group select {
   background: var(--surface-light);
   border: 1px solid var(--border);
   color: var(--text);
@@ -345,8 +346,29 @@ button {
   font-family: inherit;
 }
 
+.form-group select {
+  cursor: pointer;
+  appearance: none;
+  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23cbd5e1' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpolyline points='6 9 12 15 18 9'%3E%3C/polyline%3E%3C/svg%3E");
+  background-repeat: no-repeat;
+  background-position: right 0.75rem center;
+  background-size: 1.25rem;
+  padding-right: 2.5rem;
+}
+
+.form-group select:hover {
+  border-color: var(--primary);
+}
+
+.form-group select option {
+  background: var(--surface);
+  color: var(--text);
+  padding: 0.5rem;
+}
+
 .form-group input:focus,
-.form-group textarea:focus {
+.form-group textarea:focus,
+.form-group select:focus {
   outline: 2px solid var(--primary);
   outline-offset: 0;
 }
@@ -357,6 +379,29 @@ button {
   gap: 1rem;
 }
 
+.form-divider {
+  display: flex;
+  align-items: center;
+  gap: 1rem;
+  color: var(--text-secondary);
+  font-size: 0.875rem;
+}
+
+.form-divider::before,
+.form-divider::after {
+  content: '';
+  flex: 1;
+  height: 1px;
+  background: var(--border);
+}
+
+.btn-secondary {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  gap: 0.5rem;
+}
+
 .login-footer {
   margin-top: 1.5rem;
   text-align: center;
diff --git a/frontend/src/components/CategorySection.jsx b/frontend/src/components/CategorySection.jsx
@@ -2,17 +2,29 @@ import { useState } from 'react';
 import { ChevronDown, ChevronUp } from 'lucide-react';
 import CriteriaItem from './CriteriaItem';
 
-export default function CategorySection({ category, criterias, evaluations, onUpdate }) {
+export default function CategorySection({ category, criterias, evaluations, onUpdate, projectMethod }) {
   const [isOpen, setIsOpen] = useState(true);
 
+  const getFilteredRequirements = requirements => {
+    return requirements.filter(req => {
+      if (typeof req === 'string') return true;
+      return !req.projectMethod || req.projectMethod === projectMethod;
+    });
+  };
+
+  const getRequirementText = req => (typeof req === 'string' ? req : req.text);
+
   const calculateCategoryProgress = () => {
     let totalCompleted = 0;
     let totalItems = 0;
 
     criterias.forEach(criteria => {
+      const filteredReqs = getFilteredRequirements(criteria.requirements);
+      const validRequirementTexts = filteredReqs.map(getRequirementText);
       const ticked = evaluations[criteria.id]?.tickedRequirements || [];
-      totalCompleted += ticked.length;
-      totalItems += criteria.requirements.length;
+      const validTicked = ticked.filter(t => validRequirementTexts.includes(t));
+      totalCompleted += validTicked.length;
+      totalItems += filteredReqs.length;
     });
 
     return totalItems > 0 ? Math.round((totalCompleted / totalItems) * 100) : 0;
@@ -45,6 +57,7 @@ export default function CategorySection({ category, criterias, evaluations, onUp
               tickedRequirements={evaluations[criteria.id]?.tickedRequirements || []}
               note={evaluations[criteria.id]?.note || ''}
               onUpdate={data => onUpdate(criteria.id, data)}
+              projectMethod={projectMethod}
             />
           ))}
         </div>
diff --git a/frontend/src/components/CriteriaItem.jsx b/frontend/src/components/CriteriaItem.jsx
@@ -2,10 +2,20 @@ import { useState } from 'react';
 import { ChevronDown, ChevronUp } from 'lucide-react';
 import { calculateGrade } from '../../../shared/gradeCalculation.js';
 
-export default function CriteriaItem({ criteria, tickedRequirements, note, onUpdate }) {
+export default function CriteriaItem({ criteria, tickedRequirements, note, onUpdate, projectMethod }) {
   const [isOpen, setIsOpen] = useState(false);
   const [localNote, setLocalNote] = useState(note || '');
 
+  const filteredRequirements = criteria.requirements.filter(req => {
+    if (typeof req === 'string') return true;
+    return !req.projectMethod || req.projectMethod === projectMethod;
+  });
+
+  const getRequirementText = req => (typeof req === 'string' ? req : req.text);
+
+  const validRequirementTexts = filteredRequirements.map(getRequirementText);
+  const validTickedRequirements = tickedRequirements.filter(t => validRequirementTexts.includes(t));
+
   const handleRequirementToggle = requirement => {
     const newTicked = tickedRequirements.includes(requirement)
       ? tickedRequirements.filter(r => r !== requirement)
@@ -25,7 +35,7 @@ export default function CriteriaItem({ criteria, tickedRequirements, note, onUpd
     onUpdate({ tickedRequirements, note: localNote });
   };
 
-  const points = calculateGrade(criteria, tickedRequirements);
+  const points = calculateGrade(criteria, validTickedRequirements, projectMethod);
   const gradeClass = points !== null ? `grade-${points}` : 'grade-none';
 
   return (
@@ -45,7 +55,7 @@ export default function CriteriaItem({ criteria, tickedRequirements, note, onUpd
             </span>
           )}
           <span className="criteria-progress">
-            {tickedRequirements.length}/{criteria.requirements.length}
+            {validTickedRequirements.length}/{filteredRequirements.length}
           </span>
           {isOpen ? <ChevronUp /> : <ChevronDown />}
         </div>
@@ -54,19 +64,22 @@ export default function CriteriaItem({ criteria, tickedRequirements, note, onUpd
       {isOpen && (
         <div className="criteria-content">
           <div className="requirements-list">
-            {criteria.requirements.map((requirement, index) => (
-              <div key={index} className="requirement-item">
-                <label>
-                  <input
-                    type={criteria.selection === 'single' ? 'radio' : 'checkbox'}
-                    name={`criteria-${criteria.id}`}
-                    checked={tickedRequirements.includes(requirement)}
-                    onChange={() => handleRequirementToggle(requirement)}
-                  />
-                  <span className="requirement-text">{requirement}</span>
-                </label>
-              </div>
-            ))}
+            {filteredRequirements.map((requirement, index) => {
+              const text = getRequirementText(requirement);
+              return (
+                <div key={index} className="requirement-item">
+                  <label>
+                    <input
+                      type={criteria.selection === 'single' ? 'radio' : 'checkbox'}
+                      name={`criteria-${criteria.id}`}
+                      checked={tickedRequirements.includes(text)}
+                      onChange={() => handleRequirementToggle(text)}
+                    />
+                    <span className="requirement-text">{text}</span>
+                  </label>
+                </div>
+              );
+            })}
           </div>
 
           <div className="note-section">
diff --git a/frontend/src/components/Header.jsx b/frontend/src/components/Header.jsx
@@ -1,11 +1,13 @@
 import { useNavigate } from 'react-router-dom';
 import { useAuth } from '../hooks/useAuth';
+import { storage } from '../services/storage';
 import { LogIn, LogOut, UserCircle, Home, Github } from 'lucide-react';
 import { APP_VERSION } from '../utils/version';
 
 export default function Header() {
   const { user, isAuthenticated, logout } = useAuth();
   const navigate = useNavigate();
+  const localProfile = storage.getProfile();
 
   const handleLogout = () => {
     logout();
@@ -51,6 +53,22 @@ export default function Header() {
                 Abmelden
               </button>
             </>
+          ) : localProfile.firstName ? (
+            <>
+              <div className="user-info">
+                <UserCircle size={18} />
+                <span>
+                  {localProfile.firstName} {localProfile.lastName || ''}
+                </span>
+              </div>
+              <button onClick={() => navigate('/onboarding?edit=true')} className="btn-secondary-small">
+                Profil
+              </button>
+              <button onClick={() => navigate('/login')} className="btn-secondary-small">
+                <LogIn size={16} />
+                Anmelden
+              </button>
+            </>
           ) : (
             <button onClick={() => navigate('/login')} className="btn-primary-small">
               <LogIn size={16} />
diff --git a/frontend/src/components/ProgressOverview.jsx b/frontend/src/components/ProgressOverview.jsx
@@ -8,26 +8,22 @@ export default function ProgressOverview({
   onExport,
   onImport,
   onReset,
-  isAuthenticated,
+  projectMethod,
 }) {
-  const categoryScores = calculateCategoryScores(categories, criterias, evaluations);
+  const categoryScores = calculateCategoryScores(categories, criterias, evaluations, projectMethod);
   const finalGrade = calculateFinalGrade(categoryScores);
 
   return (
     <div className="progress-overview">
       <div className="overview-header">
         <h2>Übersicht</h2>
         <div className="overview-actions">
-          {!isAuthenticated && (
-            <>
-              <button onClick={onExport} className="btn-icon" title="Export">
-                <Download size={18} />
-              </button>
-              <button onClick={onImport} className="btn-icon" title="Import">
-                <Upload size={18} />
-              </button>
-            </>
-          )}
+          <button onClick={onExport} className="btn-icon" title="Export">
+            <Download size={18} />
+          </button>
+          <button onClick={onImport} className="btn-icon" title="Import">
+            <Upload size={18} />
+          </button>
           <button onClick={onReset} className="btn-icon btn-danger" title="Alles zurücksetzen">
             <Trash2 size={18} />
           </button>
diff --git a/frontend/src/pages/Criteria.jsx b/frontend/src/pages/Criteria.jsx
diff --git a/frontend/src/pages/Onboarding.jsx b/frontend/src/pages/Onboarding.jsx
diff --git a/frontend/src/pages/Profile.jsx b/frontend/src/pages/Profile.jsx
diff --git a/frontend/src/services/storage.js b/frontend/src/services/storage.js
diff --git a/shared/gradeCalculation.js b/shared/gradeCalculation.js

Original file line number	Diff line number	Diff line change
`@@ -26,4 +26,4 @@ WORKDIR /app/backend`
`26`	`26`
`27`	`27`	`EXPOSE 3000`
`28`	`28`
`29`		`-CMD ["bun", "run", "src/index.js"]`
	`29`	`+CMD ["sh", "-c", "bun run src/db/migrate.js && bun run src/index.js"]`
Original file line number	Diff line number	Diff line change
`@@ -28,8 +28,7 @@ export const optionalAuth = async (req, res, next) => {`
`28`	`28`	`try {`
`29`	`29`	`const decoded = jwt.verify(token, JWT_SECRET);`
`30`	`30`	`req.userId = decoded.userId;`
`31`		`- } catch (error) {`
`32`		`- console.error('Invalid token:', error);`
	`31`	`+ } catch {`
`33`	`32`	`req.userId = null;`
`34`	`33`	`}`
`35`	`34`	`}`