diff --git a/application/controllers/api/frontend/v1/stv/Kontakt.php b/application/controllers/api/frontend/v1/stv/Kontakt.php index 379184ee0..35c6f3e96 100644 --- a/application/controllers/api/frontend/v1/stv/Kontakt.php +++ b/application/controllers/api/frontend/v1/stv/Kontakt.php @@ -439,7 +439,6 @@ class Kontakt extends FHCAPI_Controller { return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Kontakt_id']), self::ERROR_TYPE_GENERAL); } - // $this->outputJsonSuccess(current(getData($result))); $this->terminateWithSuccess(current(getData($result))); } @@ -523,13 +522,6 @@ class Kontakt extends FHCAPI_Controller $this->terminateWithValidationErrors($this->form_validation->error_array()); } -/* if(isset($_POST['standort'])) - { - $standort_id = $_POST['standort']['standort_id']; - } - else - $standort_id = null;*/ - $uid = getAuthUID(); $kontakttyp = $this->input->post('kontakttyp'); $anmerkung = $this->input->post('anmerkung'); @@ -538,8 +530,6 @@ class Kontakt extends FHCAPI_Controller $person_id = $this->input->post('person_id'); $standort_id = $this->input->post('standort_id'); - //return $this->terminateWithError("in update " . $standort_id, self::ERROR_TYPE_GENERAL); - $result = $this->KontaktModel->update( [ 'kontakt_id' => $kontakt_id diff --git a/public/js/components/Betriebsmittel/Betriebsmittel.js b/public/js/components/Betriebsmittel/Betriebsmittel.js index a3acb6673..3849578ea 100644 --- a/public/js/components/Betriebsmittel/Betriebsmittel.js +++ b/public/js/components/Betriebsmittel/Betriebsmittel.js @@ -66,7 +66,7 @@ export default { let button = document.createElement('button'); button.className = 'btn btn-outline-secondary btn-action'; button.innerHTML = ''; - button.title = 'Übernahmebestätigung drucken'; + button.title = this.$p.t('betriebsmittel', 'btn_printUebernahmebestaetigung'); let cellData = cell.getData(); button.addEventListener( 'click', @@ -82,7 +82,7 @@ export default { button = document.createElement('button'); button.className = 'btn btn-outline-secondary btn-action'; button.innerHTML = ''; - button.title = 'Betriebsmittel bearbeiten'; + button.title = this.$p.t('betriebsmittel', 'btn_editBetriebsmittel'); button.addEventListener( 'click', (event) => @@ -93,7 +93,7 @@ export default { button = document.createElement('button'); button.className = 'btn btn-outline-secondary btn-action'; button.innerHTML = ''; - button.title = 'Betriebsmittel löschen'; + button.title = this.$p.t('betriebsmittel', 'btn_deleteBetriebsmittel'); button.addEventListener( 'click', () => @@ -117,26 +117,31 @@ export default { event: 'tableBuilt', handler: async() => { - await this.$p.loadCategory(['wawi', 'global', 'infocenter']); + await this.$p.loadCategory(['wawi', 'global', 'infocenter', 'betriebsmittel']); let cm = this.$refs.table.tabulator.columnManager; cm.getColumnByField('nummer').component.updateDefinition({ title: this.$p.t('wawi', 'nummer') }); + cm.getColumnByField('betriebsmitteltyp').component.updateDefinition({ + title: this.$p.t('global', 'typ') + }); cm.getColumnByField('anmerkung').component.updateDefinition({ title: this.$p.t('global', 'anmerkung') }); cm.getColumnByField('format_retour').component.updateDefinition({ title: this.$p.t('wawi', 'retourdatum') }); + cm.getColumnByField('beschreibung').component.updateDefinition({ + title: this.$p.t('global', 'beschreibung') + }); cm.getColumnByField('kaution').component.updateDefinition({ title: this.$p.t('infocenter', 'kaution') }); cm.getColumnByField('format_ausgabe').component.updateDefinition({ title: this.$p.t('wawi', 'ausgabedatum') }); - } } ], @@ -261,7 +266,7 @@ export default { :side-menu="false" reload new-btn-show - new-btn-label="Betriebsmittel" + :new-btn-label="this.$p.t('ui', 'betriebsmittel')" @click:new="actionNewBetriebsmittel" > diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js index c6bd07be4..872f16122 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js @@ -60,7 +60,7 @@ export default{ {title:"letzte Änderung", field:"updateamum", visible:false}, {title:"Rechnungsadresse", field:"rechnungsadresse", visible:false, formatter: (cell, formatterParams, onRendered) => { - let output = cell.getValue() ? "ja" : "nein"; + let output = cell.getValue() ? this.$p.t('ui','ja') : this.$p.t('ui','nein'); return output; } }, @@ -74,6 +74,7 @@ export default{ let button = document.createElement('button'); button.className = 'btn btn-outline-secondary btn-action'; button.innerHTML = ''; + button.title = this.$p.t('person', 'adresse_edit'); button.addEventListener('click', (event) => this.actionEditAdress(cell.getData().adresse_id) ); @@ -82,6 +83,7 @@ export default{ button = document.createElement('button'); button.className = 'btn btn-outline-secondary btn-action'; button.innerHTML = ''; + button.title = this.$p.t('person', 'adresse_delete'); button.addEventListener('click', () => this.actionDeleteAdress(cell.getData().adresse_id) ); @@ -103,7 +105,7 @@ export default{ { event: 'tableBuilt', handler: async () => { - await this.$p.loadCategory(['notiz','global','person', 'ui']); + await this.$p.loadCategory(['notiz', 'global', 'person', 'ui']); let cm = this.$refs.table.tabulator.columnManager; cm.getColumnByField('bezeichnung').component.updateDefinition({ @@ -574,7 +576,7 @@ export default{ :side-menu="false" reload new-btn-show - new-btn-label="Adresse" + :new-btn-label="this.$p.t('person', 'adresse')" @click:new="actionNewAdress" > diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js index 7eb1229f7..41ca5e550 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js @@ -63,6 +63,7 @@ export default{ let button = document.createElement('button'); button.className = 'btn btn-outline-secondary btn-action'; button.innerHTML = ''; + button.title = this.$p.t('person', 'bankvb_edit'); button.addEventListener('click', (event) => this.actionEditBankverbindung(cell.getData().bankverbindung_id) ); @@ -71,6 +72,7 @@ export default{ button = document.createElement('button'); button.className = 'btn btn-outline-secondary btn-action'; button.innerHTML = ''; + button.title = this.$p.t('person', 'bankvb_delete'); button.addEventListener('click', () => this.actionDeleteBankverbindung(cell.getData().bankverbindung_id) ); @@ -96,6 +98,14 @@ export default{ let cm = this.$refs.table.tabulator.columnManager; + cm.getColumnByField('name').component.updateDefinition({ + title: this.$p.t('global', 'name') + }); + + cm.getColumnByField('typ').component.updateDefinition({ + title: this.$p.t('global', 'typ') + }); + cm.getColumnByField('anschrift').component.updateDefinition({ title: this.$p.t('person', 'anschrift') }); @@ -105,9 +115,7 @@ export default{ cm.getColumnByField('blz').component.updateDefinition({ title: this.$p.t('person', 'blz') }); - cm.getColumnByField('typ').component.updateDefinition({ - title: this.$p.t('global', 'typ') - }); + cm.getColumnByField('verrechnung').component.updateDefinition({ title: this.$p.t('person', 'verrechnung') }); @@ -234,7 +242,7 @@ export default{ @@ -328,7 +336,7 @@ export default{ :side-menu="false" reload new-btn-show - new-btn-label="Bankverbindung" + :new-btn-label="this.$p.t('person', 'bankverbindung')" @click:new="actionNewBankverbindung" > diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js index 3acb6353d..9d6eb06d7 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js @@ -51,6 +51,7 @@ export default{ let button = document.createElement('button'); button.className = 'btn btn-outline-secondary btn-action'; button.innerHTML = ''; + button.title = this.$p.t('person', 'kontakt_edit'); button.addEventListener('click', (event) => this.actionEditContact(cell.getData().kontakt_id) ); @@ -59,6 +60,7 @@ export default{ button = document.createElement('button'); button.className = 'btn btn-outline-secondary btn-action'; button.innerHTML = ''; + button.title = this.$p.t('person', 'kontakt_delete'); button.addEventListener('click', () => this.actionDeleteContact(cell.getData().kontakt_id) ); @@ -393,7 +395,7 @@ export default{ :side-menu="false" reload new-btn-show - new-btn-label="Kontakt" + :new-btn-label="this.$p.t('global', 'kontakt')" @click:new="actionNewContact" > diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js index ac4a2dd9e..0552f1a37 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js @@ -92,7 +92,7 @@ export default{ let button = document.createElement('button'); button.className = 'btn btn-outline-secondary btn-action'; button.innerHTML = ''; - button.title = 'Status vorrücken'; + button.title = this.$p.t('ui', 'btn_statusVorruecken'); button.addEventListener('click', () => this.actionAdvanceStatus(data.status_kurzbz, data.studiensemester_kurzbz, data.ausbildungssemester) ); @@ -103,7 +103,7 @@ export default{ button = document.createElement('button'); button.className = 'btn btn-outline-secondary btn-action'; button.innerHTML = ''; - button.title = 'Status bestätigen'; + button.title = this.$p.t('ui', 'btn_confirmStatus'); button.addEventListener('click', () => this.actionConfirmStatus(data.status_kurzbz, data.studiensemester_kurzbz, data.ausbildungssemester) ); @@ -114,7 +114,7 @@ export default{ button = document.createElement('button'); button.className = 'btn btn-outline-secondary btn-action'; button.innerHTML = ''; - button.title = 'Status bearbeiten'; + button.title = this.$p.t('ui', 'btn_editStatus'); button.addEventListener('click', () => this.actionEditStatus(data.status_kurzbz, data.studiensemester_kurzbz, data.ausbildungssemester) ); @@ -125,7 +125,7 @@ export default{ button = document.createElement('button'); button.className = 'btn btn-outline-secondary btn-action'; button.innerHTML = ''; - button.title = 'Status löschen'; + button.title = this.$p.t('ui', 'btn_deleteStatus'); button.addEventListener('click', () => this.actionDeleteStatus(data.status_kurzbz, data.studiensemester_kurzbz, data.ausbildungssemester) ); @@ -154,7 +154,7 @@ export default{ { event: 'tableBuilt', handler: async () => { - await this.$p.loadCategory(['lehre','global','person']); + await this.$p.loadCategory(['lehre','global','person','ui']); let cm = this.$refs.table.tabulator.columnManager; @@ -328,7 +328,7 @@ export default{ :side-menu="false" reload new-btn-show - new-btn-label="Status" + :new-btn-label="this.$p.t('global', 'status')" @click:new="actionNewStatus" > diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Status/Dropdown.js b/public/js/components/Stv/Studentenverwaltung/Details/Status/Dropdown.js index 77e1db67b..203442975 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Status/Dropdown.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Status/Dropdown.js @@ -35,7 +35,6 @@ export default { data() { return { listDataToolbar: [], - //TODO(Manu) get from config statiInteressent: ["Bewerber", "Aufgenommener", "Student" , "Wartender", "Abgewiesener"], statiStudent: ["Abbrecher", "Unterbrecher", "Student" , "Diplomand", "Absolvent"] }; diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php index 7019892e0..5577f4079 100644 --- a/system/phrasesupdate.php +++ b/system/phrasesupdate.php @@ -27295,6 +27295,26 @@ array( ) ) ), + array( + 'app' => 'core', + 'category' => 'person', + 'phrase' => 'bankverbindung', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Bankverbindung', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'bank details', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), //Status array( 'app' => 'core', @@ -28416,6 +28436,87 @@ array( ) ) ), + array( + 'app' => 'core', + 'category' => 'ui', + 'phrase' => 'btn_statusVorruecken', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Status vorrücken', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'advance status', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'core', + 'category' => 'ui', + 'phrase' => 'btn_confirmStatus', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Status bestätigen', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'confirm status', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'core', + 'category' => 'ui', + 'phrase' => 'btn_editStatus', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Status bearbeiten', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'edit status', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'core', + 'category' => 'ui', + 'phrase' => 'btn_deleteStatus', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Status löschen', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'delete status', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + // Betriebsmittel begin array( 'app' => 'core', @@ -30165,6 +30266,66 @@ array( ) ) ), + array( + 'app' => 'core', + 'category' => 'betriebsmittel', + 'phrase' => 'btn_printUebernahmebestaetigung', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Übernahmebestätigung drucken', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'Print acceptance confirmation', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'core', + 'category' => 'betriebsmittel', + 'phrase' => 'btn_editBetriebsmittel', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Betriebsmittel bearbeiten', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'Edit Resource', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'core', + 'category' => 'betriebsmittel', + 'phrase' => 'btn_deleteBetriebsmittel', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Betriebsmittel löschen', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'Delete Resource', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), // Betriebsmittel end array( 'app' => 'core',