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.
This commit is contained in:
Stiftung Development
@@ -118,16 +118,16 @@
|
||||
</div>
|
||||
<div class="card-body">
|
||||
<div class="d-grid gap-2">
|
||||
<a href="#" class="btn btn-outline-success btn-sm" onclick="downloadTemplate('destinataere')">
|
||||
<a href="#" class="btn btn-outline-success btn-sm" onclick="downloadTemplate('destinataere'); return false;">
|
||||
<i class="fas fa-download"></i> Destinatäre-Vorlage
|
||||
</a>
|
||||
<a href="#" class="btn btn-outline-success btn-sm" onclick="downloadTemplate('paechter')">
|
||||
<a href="#" class="btn btn-outline-success btn-sm" onclick="downloadTemplate('paechter'); return false;">
|
||||
<i class="fas fa-download"></i> Pächter-Vorlage
|
||||
</a>
|
||||
<a href="#" class="btn btn-outline-success btn-sm" onclick="downloadTemplate('laendereien')">
|
||||
<a href="#" class="btn btn-outline-success btn-sm" onclick="downloadTemplate('laendereien'); return false;">
|
||||
<i class="fas fa-download"></i> Ländereien-Vorlage
|
||||
</a>
|
||||
<a href="#" class="btn btn-outline-secondary btn-sm" onclick="downloadTemplate('personen')">
|
||||
<a href="#" class="btn btn-outline-secondary btn-sm" onclick="downloadTemplate('personen'); return false;">
|
||||
<i class="fas fa-download"></i> Personen-Vorlage (Legacy)
|
||||
</a>
|
||||
</div>
|
||||
@@ -140,42 +140,87 @@
|
||||
|
||||
{% endblock %}
|
||||
|
||||
{% block extra_js %}
|
||||
{% block javascript %}
|
||||
<script>
|
||||
function downloadTemplate(type) {
|
||||
console.log('downloadTemplate called with type:', type);
|
||||
let headers, filename, exampleRow;
|
||||
|
||||
if (type === 'destinataere') {
|
||||
headers = ['Vorname', 'Nachname', 'Familienzweig', 'E-Mail', 'Telefon', 'IBAN', 'Straße', 'PLZ', 'Ort', 'Geburtsdatum', 'Berufsgruppe', 'Ausbildungsstand', 'Institution', 'Projektbeschreibung', 'Jährliches_Einkommen', 'Finanzielle_Notlage', 'Notizen', 'Aktiv'];
|
||||
headers = ['Vorname', 'Nachname', 'Familienzweig', 'E-Mail', 'Telefon', 'IBAN', 'Straße', 'PLZ', 'Ort', 'Geburtsdatum', 'Berufsgruppe', 'Ausbildungsstand', 'Institution', 'Projektbeschreibung', 'Jährliches_Einkommen', 'Finanzielle_Notlage', 'Ist_Abkömmling', 'Haushaltsgroesse', 'Monatliche_Bezuege', 'Vermoegen', 'Unterstuetzung_Bestaetigt', 'Vierteljaehrlicher_Betrag', 'Studiennachweis_Erforderlich', 'Letzter_Studiennachweis', 'Notizen', 'Aktiv'];
|
||||
filename = 'destinataere_vorlage.csv';
|
||||
exampleRow = 'Max,Mustermann,hauptzweig,max@email.com,0123456789,DE12345678901234567890,Musterstraße 1,12345,Musterstadt,01.01.1990,student,Abitur,Universität Musterstadt,Studium der Informatik,15000,false,Beispiel Notiz,true';
|
||||
exampleRow = 'Max,Mustermann,hauptzweig,max@email.com,0123456789,DE12345678901234567890,Musterstraße 1,12345,Musterstadt,01.01.1990,student,Abitur,Universität Musterstadt,Studium der Informatik,15000,false,true,1,500,10000,false,400,false,,Beispiel Notiz,true';
|
||||
} else if (type === 'paechter') {
|
||||
headers = ['Vorname', 'Nachname', 'E-Mail', 'Telefon', 'IBAN', 'Straße', 'PLZ', 'Ort', 'Personentyp', 'Geburtsdatum', 'Pachtnummer', 'Pachtbeginn_Erste', 'Pachtende_Letzte', 'Pachtzins_Aktuell', 'Landwirtschaftliche_Ausbildung', 'Berufserfahrung_Jahre', 'Spezialisierung', 'Notizen', 'Aktiv'];
|
||||
filename = 'paechter_vorlage.csv';
|
||||
exampleRow = 'Hans,Bauer,hans@email.com,0123456789,DE12345678901234567890,Bauernhof 1,12345,Bauerndorf,natuerlich,01.01.1980,P001,01.01.2020,31.12.2029,5000,true,15,Ackerbau,Beispiel Notiz,true';
|
||||
} else if (type === 'laendereien') {
|
||||
headers = ['Lfd_Nr', 'EW_Nummer', 'Amtsgericht', 'Gemeinde', 'Gemarkung', 'Flur', 'Flurstück', 'Größe_qm', 'Grünland_qm', 'Acker_qm', 'Wald_qm', 'Sonstiges_qm', 'Verpachtete_Gesamtfläche_qm', 'Verp_Fläche_aktuell_qm', 'Aktiv', 'Notizen'];
|
||||
headers = ['Lfd_Nr', 'EW_Nummer', 'Grundbuchblatt', 'Amtsgericht', 'Gemeinde', 'Gemarkung', 'Flur', 'Flurstück', 'Adresse', 'Größe_qm', 'Grünland_qm', 'Acker_qm', 'Wald_qm', 'Sonstiges_qm', 'Verpachtete_Gesamtfläche_qm', 'Fläche_alte_Liste_qm', 'Verp_Fläche_aktuell_qm', 'Aktueller_Pächter', 'Pächter_Name', 'Pächter_Anschrift', 'Pachtbeginn', 'Pachtende', 'Verlängerung_Klausel', 'Zahlungsweise', 'Pachtzins_pro_ha', 'Pachtzins_pauschal', 'USt_Option', 'USt_Satz', 'Grundsteuer_Umlage', 'Versicherungen_Umlage', 'Verbandsbeiträge_Umlage', 'Jagdpacht_Anteil_Umlage', 'Anteil_Grundsteuer', 'Anteil_LWK', 'Aktiv', 'Notizen'];
|
||||
filename = 'laendereien_vorlage.csv';
|
||||
exampleRow = 'L001,EW001,Amtsgericht Musterstadt,Musterstadt,Mustergemarkung,1,123,10000,5000,3000,1500,500,8000,8000,true,Beispiel Notiz';
|
||||
exampleRow = 'L001,EW001,Grundbuch123,Amtsgericht Musterstadt,Musterstadt,Mustergemarkung,1,123,"Musterfeld 1",10000,5000,3000,1500,500,8000,7500,8000,,Max Musterpächter,"Max Musterpächter Bauernhof 1 12345 Dorf",2020-01-01,2029-12-31,true,jaehrlich,500.00,4000.00,false,19.00,true,true,true,false,100.00,50.00,true,"Beispiel Notiz"';
|
||||
} else if (type === 'personen') {
|
||||
headers = ['Vorname', 'Nachname', 'Familienzweig', 'E-Mail', 'Telefon', 'IBAN', 'Adresse', 'Geburtsdatum', 'Notizen', 'Aktiv'];
|
||||
filename = 'personen_legacy_vorlage.csv';
|
||||
exampleRow = 'Beispiel,Beispiel,hauptzweig,beispiel@email.com,0123456789,DE12345678901234567890,Beispielstraße 1,01.01.1990,Beispiel Notiz,true';
|
||||
}
|
||||
|
||||
console.log('Headers count:', headers ? headers.length : 'undefined');
|
||||
console.log('Filename:', filename);
|
||||
|
||||
// Create CSV content
|
||||
const csvContent = headers.join(',') + '\n' + exampleRow;
|
||||
console.log('CSV content length:', csvContent.length);
|
||||
|
||||
// Create download link
|
||||
const blob = new Blob([csvContent], { type: 'text/csv;charset=utf-8;' });
|
||||
const link = document.createElement('a');
|
||||
const url = URL.createObjectURL(blob);
|
||||
link.setAttribute('href', url);
|
||||
link.setAttribute('download', filename);
|
||||
link.style.visibility = 'hidden';
|
||||
document.body.appendChild(link);
|
||||
link.click();
|
||||
document.body.removeChild(link);
|
||||
try {
|
||||
// Create download link
|
||||
const blob = new Blob([csvContent], { type: 'text/csv;charset=utf-8;' });
|
||||
|
||||
// Try the modern approach first
|
||||
if (window.navigator && window.navigator.msSaveOrOpenBlob) {
|
||||
// For IE/Edge
|
||||
window.navigator.msSaveOrOpenBlob(blob, filename);
|
||||
console.log('Download via IE/Edge method');
|
||||
} else {
|
||||
// For other browsers
|
||||
const link = document.createElement('a');
|
||||
const url = URL.createObjectURL(blob);
|
||||
link.setAttribute('href', url);
|
||||
link.setAttribute('download', filename);
|
||||
link.style.visibility = 'hidden';
|
||||
link.style.display = 'none';
|
||||
document.body.appendChild(link);
|
||||
|
||||
// Force click
|
||||
setTimeout(() => {
|
||||
link.click();
|
||||
console.log('Link clicked');
|
||||
|
||||
// Clean up
|
||||
setTimeout(() => {
|
||||
document.body.removeChild(link);
|
||||
URL.revokeObjectURL(url);
|
||||
console.log('Cleanup completed');
|
||||
}, 100);
|
||||
}, 100);
|
||||
}
|
||||
console.log('Download should have started for:', filename);
|
||||
} catch (error) {
|
||||
console.error('Error in download:', error);
|
||||
|
||||
// Fallback: try data URL approach
|
||||
try {
|
||||
const dataUrl = 'data:text/csv;charset=utf-8,' + encodeURIComponent(csvContent);
|
||||
const link = document.createElement('a');
|
||||
link.setAttribute('href', dataUrl);
|
||||
link.setAttribute('download', filename);
|
||||
link.click();
|
||||
console.log('Fallback download method used');
|
||||
} catch (fallbackError) {
|
||||
console.error('Fallback download also failed:', fallbackError);
|
||||
alert('Fehler beim Download: ' + error.message + '\n\nBitte kopieren Sie den CSV-Inhalt aus der Browserkonsole.');
|
||||
console.log('CSV Content for manual copy:\n' + csvContent);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// File validation
|
||||
|
||||
Reference in New Issue
Block a user