Commit Graph

74 Commits

Author SHA1 Message Date
Stiftung Development
36c66a803c Fix cookie configuration and update destinataer workflow
- Fixed empty cookie name issue in production by improving fallback logic
- Changed 'Neue Förderung' to 'Neue Unterstützung' in destinataer detail page
- Updated icon from fa-gift to fa-heart for better UX
- Workflow now correctly uses unterstuetzung_create with destinataer pre-population

Resolves CookieError: Illegal key '' in production environment
2025-09-21 22:52:55 +02:00
Stiftung Development
6282d1a02f Implement session cookie isolation between Django apps
- Added configurable SESSION_COOKIE_NAME and CSRF_COOKIE_NAME to Django settings
- Main app now uses 'stiftung_sessionid' instead of default 'sessionid'
- Paperless continues using default 'sessionid' for separation
- All configuration centralized in .env files as requested
- Updated both development and production compose configurations
- Added session settings to env templates for easy deployment

This resolves the session conflict where logging into one app would
kick out sessions from the other app. Both applications now maintain
independent login sessions.
2025-09-21 22:44:31 +02:00
Stiftung Development
b8a6e99f07 Add German OCR support to Paperless-ngx
- Created custom Dockerfile extending official paperless-ngx image
- Added tesseract-ocr-deu package for German language OCR
- Set PAPERLESS_OCR_LANGUAGE=deu+eng environment variable
- Updated CI/CD pipeline to build and push custom paperless image
- Modified deployment script to pull paperless image from GHCR
- Tested locally: German (deu) language pack now available alongside English
2025-09-21 21:09:58 +02:00
Stiftung Development
34b30be0a6 Fix deployment pipeline: resolve git divergent branches and prevent paperless build issues
- Updated git pull strategy to use fetch + reset instead of pull to handle divergent branches
- Added docker system prune to clean up build artifacts
- Modified image pulling to separate web services from standard images
- Added --no-build flag to prevent accidental local builds
- Addresses production 502 errors from failed deployments
2025-09-21 20:52:41 +02:00
Stiftung Development
8c7a5173a8 Trigger production deployment: force redeploy working local code
- Local environment tested and working correctly
- All Destinataer improvements verified locally
- Trigger GitHub Actions to redeploy to production VPS
- Address 502 errors on production server
2025-09-21 20:26:16 +02:00
Stiftung Development
15c798a97b Update footer version to v2.1.4 - Enhanced Destinataer Management
- Bump version from v2.1.3 to v2.1.4
- Update status badge from 'Stabil' to 'Enhanced'
- Reflect recent improvements to Destinataer inline editing and CSV import
2025-09-21 20:12:32 +02:00
Stiftung Development
8854fc2619 Enhance Destinataer functionality: inline editing and improved list view
- Add inline edit mode to destinataer detail view with AJAX save/cancel
- Fix form validation by aligning select choices with model definitions
- Update Destinataer model to make familienzweig and berufsgruppe optional
- Fix StiftungsKonto integration in forms and views
- Redesign destinataer list view with new column layout:
  * Vorname, Nachname, E-Mail, Vierteljährlicher Betrag
  * Letzter Studiennachweis, Unterstützung bestätigt, Aktionen
- Improve form styling and user experience
- Add proper field validation and error handling
- Enhance UI with better badges, icons, and formattingv2_sortorderfixed_remmer
2025-09-20 00:14:26 +02:00
Stiftung Development
69128196ef Enhance Destinataer functionality: inline editing and improved list view
- Add inline edit mode to destinataer detail view with AJAX save/cancel
- Fix form validation by aligning select choices with model definitions
- Update Destinataer model to make familienzweig and berufsgruppe optional
- Fix StiftungsKonto integration in forms and views
- Redesign destinataer list view with new column layout:
  * Vorname, Nachname, E-Mail, Vierteljährlicher Betrag
  * Letzter Studiennachweis, Unterstützung bestätigt, Aktionen
- Improve form styling and user experience
- Add proper field validation and error handling
- Enhance UI with better badges, icons, and formatting
2025-09-19 23:52:26 +02:00
Stiftung Development
584e2b8554 Add inline edit functionality to destinataer detail view - Added toggle between view and edit modes while maintaining elegant card design - Implemented AJAX form submission for seamless saving - Added JavaScript functionality for edit/save/cancel operations - Enhanced user experience with keyboard shortcuts and notifications 2025-09-19 22:52:14 +02:00
Stiftung Development
27396e8f9e Standardize form layouts: all input fields positioned underneath labels
- Change all form templates from col-md-6 to col-12 layout
- Affects destinataer_form.html, paechter_form.html, and land_form.html
- Ensures consistent single-column layout across all entity forms
- All input fields now appear underneath their labels instead of side-by-side
- Improves form readability and user experience on all screen sizes
2025-09-19 14:00:06 +02:00
Stiftung Development
7744a18657 Fix and enhance CSV import templates
- Update Destinataer template: added 8 missing fields (ist_abkoemmling, haushaltsgroesse, monatliche_bezuege, vermoegen, unterstuetzung_bestaetigt, vierteljaehrlicher_betrag, studiennachweis_erforderlich, letzter_studiennachweis)
- Update Laendereien template: added 20 missing fields including property details, tenant info, contract terms, financial data, and tax information
- Fix JavaScript template download functionality: correct block name from extra_js to javascript
- Add comprehensive debugging and error handling for download process
- Improve CSV formatting with proper quoting for text fields containing spaces
- Add fallback download methods for better browser compatibility

All CSV templates now include complete field sets matching current model definitions.
2025-09-19 12:36:17 +02:00
Stiftung Development
1422daa57a Add back GRAMPSWEB_BASE_URL=/ahnenforschung for reverse proxy 2025-09-19 09:28:12 +02:00
Stiftung Development
3faf6f2be5 Remove GRAMPSWEB_BASE_URL to test direct access 2025-09-18 21:18:44 +02:00
Stiftung Development
b599c85f0e Fix Grampsweb Redis rate limiting configuration (STORAGE_URI not STORAGE_URL) 2025-09-18 17:23:01 +02:00
Stiftung Development
c9513edb76 Add SQLite backend for Grampsweb initialization 2025-09-18 17:01:55 +02:00
Stiftung Development
af7ca25b29 Add Grampsweb Redis and Celery configuration for reverse proxy support 2025-09-18 16:41:32 +02:00
Stiftung Development
45bb040bdd Add missing Grampsweb port mapping 8090:5000 2025-09-18 16:25:47 +02:00
Stiftung Development
82994504be Fix Grampsweb port mapping from 8090:80 to 8090:5000 2025-09-18 16:19:02 +02:00
Stiftung Development
82d4dad7ab Configure Gramps for reverse proxy access via /ahnenforschung
- Remove external port mapping for grampsweb service
- Add GRAMPSWEB_BASE_URL environment variable
- Gramps will be accessible via https://vhtv-stiftung.de/ahnenforschung/
- Requires Nginx reverse proxy configuration on VPS
2025-09-18 00:07:08 +02:00
Stiftung Development
b7be251739 Fix Paperless thumbnail URLs: Remove duplicate /paperless/ path
- get_paperless_thumbnail_url() was adding /paperless/ twice
- PAPERLESS_API_URL already includes /paperless/ prefix
- Now generates: base_url/api/documents/{id}/thumb/ instead of base_url/api/paperless/documents/{id}/thumb/
- Fixes thumbnail display functionality
2025-09-17 23:55:45 +02:00
Stiftung Development
ea84ad86e7 Fix Paperless document redirect: Remove duplicate /paperless/ path
- paperless_document_redirect was adding /paperless/ twice
- PAPERLESS_API_URL already includes /paperless/ path
- Now redirects to: base_url/documents/{id}/details/ instead of base_url/paperless/documents/{id}/details/
- Fixes 404 errors when clicking document links
2025-09-17 23:46:22 +02:00
Stiftung Development
0fbaf7abb2 URGENT: Fix production Paperless integration
- Remove hardcoded fallbacks from config.py (relied on old prod values)
- Add missing Paperless env vars to compose.yml for production
- Update compose.dev.yml with complete Paperless configuration
- Fixes 500 errors by ensuring all env vars are passed to containers

Required: VPS .env must have PAPERLESS_*_TAG_ID and PAPERLESS_*_TAG variables
2025-09-17 22:06:01 +02:00
Stiftung Development
002e649116 Environment-only configuration: Remove hardcoded tag IDs and fix Paperless redirect
- Remove hardcoded defaults from PAPERLESS_*_TAG_ID in settings.py
- Fix Paperless document redirect to include /paperless/ prefix and /details/ suffix
- Update footer to v2.1.3 with deer icon
- Requires PAPERLESS_DESTINATAERE_TAG_ID, PAPERLESS_LAND_TAG_ID, PAPERLESS_ADMIN_TAG_ID in environment
2025-09-17 21:33:37 +02:00
Stiftung Development
d62e5cacff Update footer to v2.1.2 with improved styling and stable badge 2025-09-17 20:12:49 +02:00
Stiftung Development
cbde96698b Fix deployment pipeline - use main compose.yml instead of deploy-production
- Remove reference to deploy-production/docker-compose.prod.yml (now archived)
- Use compose.yml directly as the production configuration
- This should fix the deployment script and enable proper image updates
2025-09-17 19:54:23 +02:00
Stiftung Development
ebb9a1f887 Test deployment pipeline - update footer version to v2.1.1 2025-09-17 19:24:03 +02:00
Stiftung Development
25406036ea Update Paperless tag IDs to match current Paperless configuration
- Destinatäre tag ID: 210  4
- Land/Pächter tag ID: 204  5
- Administration tag ID: 216  6
2025-09-17 14:16:03 +02:00
Stiftung Development
a6559daeb1 Clean up docker-compose configuration
- Archive deploy-production directory as deploy-production-archived (legacy)
- Add DOCKER_COMPOSE_README.md for documentation
- Main configuration now uses compose.yml with working Paperless integration
- Paperless API URL configured as https://vhtv-stiftung.de/paperless
2025-09-17 13:19:35 +02:00
Stiftung Development
bbe3208fc0 Use external Paperless URL to avoid Host header issues 2025-09-16 23:16:02 +02:00
Stiftung Development
1a869372b4 Fix Paperless API URL to include /paperless path prefix 2025-09-16 22:56:36 +02:00
Stiftung Development
0c97c01396 Fix Paperless integration: use internal Docker network URL (http://paperless:8000) + improved error handling 2025-09-16 16:29:07 +02:00
Stiftung Development
a39995ce89 Test deployment: Remove 'Jan Remmer Siebels' from footer - pipeline test #2 2025-09-16 16:13:22 +02:00
Stiftung Development
aa85c48db3 Test deployment: Add 'Jan Remmer Siebels' to footer 2025-09-16 10:03:39 +02:00
Stiftung Development
155bacec9f Fix GHCR authentication: add fallback to local build + improved error handling 2025-09-16 09:53:57 +02:00
Stiftung Development
833de4a0c4 Add production debugging script for future troubleshooting 2025-09-16 00:04:03 +02:00
Stiftung Development
8a4a494610 Fix production deployment: preserve .env file + add missing volume + simplified pipeline 2025-09-15 23:41:54 +02:00
Stiftung Development
5ff7b7a3ed Fix production deployment: use pre-built images instead of local builds + handle git conflicts 2025-09-15 23:21:05 +02:00
Stiftung Development
f4f7d26d36 fix: Update CI/CD deployment to use active compose.yml file
- Fix deployment script to copy docker-compose.prod.yml to compose.yml (not docker-compose.yml)
- Update all docker-compose commands to use -f compose.yml explicitly
- Rename legacy deploy-synology/docker-compose.yml to .old
- This should fix the deployment issue where VPS wasn't getting updated
2025-09-15 23:02:24 +02:00
Stiftung Development
0d92fe3d32 fix: Correct production deployment to use pre-built Docker images
CRITICAL: This fixes the deployment issue where changes weren't appearing on production

Changes:
- Update docker-compose.prod.yml to use ghcr.io pre-built images instead of local builds
- Fix deployment script to pull latest images rather than building locally
- Add proper GitHub Container Registry authentication
- Remove --build flag that was causing deployment to use stale local code

This should resolve the issue where www.vhtv-stiftung.de wasn't showing the new Verpachtung features.
2025-09-15 22:08:13 +02:00
Stiftung Development
209da869c6 fix: Correct LandVerpachtung admin field references
- Fix admin list_display and list_filter to use actual model fields
- Update field names: pachtpreis_qm -> pachtzins_pauschal, laufzeit_von -> pachtbeginn, etc.
- Add comprehensive fieldsets matching actual LandVerpachtung model structure
- Resolves SystemCheckError preventing migrations in production
2025-09-15 21:58:46 +02:00
Stiftung Development
139fcf5cfd feat: Add LandVerpachtung to Django admin interface
- Register LandVerpachtung model in admin for easy production verification
- Add comprehensive list display with status, dates, and relationships
- Include colored status display and proper fieldsets
- Enables verification of Verpachtung functionality in production
2025-09-15 21:47:30 +02:00
Stiftung Development
9df9840cf2 feat: Add version footer to verify production deployment
- Add v2.1.0 - Verpachtungsmanagement indicator in footer
- Helps verify that the new Verpachtung features are deployed
- Subtle version display for deployment confirmation
2025-09-15 21:45:59 +02:00
Stiftung Development
4be6be203e feat: Add complete Verpachtung management system
- Add LandVerpachtung model with Land and Paechter relationships
- Implement full CRUD operations for Verpachtungen
- Add responsive Bootstrap templates with JavaScript calculations
- Integrate document linking functionality similar to other entities
- Add navigation links and URL patterns
- Include CSV import support for Paechter data
- Fix template encoding issues for proper UTF-8 support
- Enhance administration interface with Verpachtung CSV import

This implements the complete Verpachtung management feature requested,
allowing users to manage land lease agreements with proper relationships
to properties (Laenderei) and tenants (Paechter), following the same
patterns as Foerderung/Destinataer relationships.
2025-09-15 21:18:01 +02:00
Stiftung Development
c8bef800c8 Test deployment pipeline - minor README update
Testing that GitHub Actions deployment preserves database configuration
2025-09-10 23:48:27 +02:00
Stiftung Development
2b0114e03f SECURITY: Remove .env from Git tracking and add to .gitignore
- Remove sensitive .env file from Git repository
- Add comprehensive .env file patterns to .gitignore
- Prevent accidental commit of environment variables and secrets
2025-09-10 23:26:28 +02:00
Stiftung Development
9075f68d16 Add gitignore for sensitive files and Docker Compose path fix script
- Add ACCOUNTS.txt and other sensitive files to .gitignore
- Add fix-paths.sh script for correcting Docker Compose volume paths
- Prevent accidental commit of passwords and API tokens
2025-09-10 23:07:32 +02:00
Stiftung Development
a92a903953 Fix env_file path to use ./app/.env instead of root .env 2025-09-10 22:44:30 +02:00
Stiftung Development
e62d898746 Fix Paperless authentication redirects - add LOGIN_REDIRECT_URL and LOGOUT_REDIRECT_URL 2025-09-09 23:26:55 +02:00
Stiftung Development
bbd0fce636 Fix Paperless port mapping to match nginx configuration (8080) 2025-09-09 23:00:20 +02:00
Stiftung Development
3506913915 Add Paperless-ngx to main compose.yml (the one actually being used) 2025-09-09 22:53:49 +02:00