diff --git a/application/controllers/Test.php b/application/controllers/Test.php deleted file mode 100644 index 2a7aa4e4e..000000000 --- a/application/controllers/Test.php +++ /dev/null @@ -1,16 +0,0 @@ -load->library('vertragsbestandteil/VertragsbestandteilLib', - null, 'VertragsbestandteilLib'); - $this->load->library('vertragsbestandteil/GehaltsbestandteilLib', - null, 'GehaltsbestandteilLib'); - } - - public function testFetch() - { - $dienstverhaeltnis_id = 1; - $stichtag = null; - - foreach($this->VertragsbestandteilLib->fetchVertragsbestandteile( - $dienstverhaeltnis_id, $stichtag) as $vertragsbestandteil) - { - //print_r($vertragsbestandteil); - echo $vertragsbestandteil . "\n"; - } - } - - public function testUpdate() - { - $now = new DateTime(); - - $data = new stdClass(); - $data->vertragsbestandteil_id = 32; - $data->von = '2022-12-05'; - - $data->wochenstunden = 45.0; - $data->vertragsbestandteiltyp_kurzbz = VertragsbestandteilFactory::VERTRAGSBESTANDTEIL_STUNDEN; - - $vb = VertragsbestandteilFactory::getVertragsbestandteil($data); - - try - { - $this->VertragsbestandteilLib->storeVertragsbestandteil($vb); - echo "Update successful.\n"; - } - catch( Exception $ex ) - { - echo "Update failed.\n"; - } - } - - - public function testInsert() - { - $now = new DateTime(); - - $data = new stdClass(); - $data->dienstverhaeltnis_id = 1; - $data->von = '2022-12-01'; - $data->insertamum = $now->format(DateTime::ATOM); - $data->insertvon = 'ma0080'; - $data->vertragsbestandteiltyp_kurzbz = VertragsbestandteilFactory::VERTRAGSBESTANDTEIL_FUNKTION; - - $data->benutzerfunktion_id = 112667; - $data->anmerkung = 'test funkton'; - $data->kuendigungsrelevant = false; - - $vb = VertragsbestandteilFactory::getVertragsbestandteil($data); - - try - { - $this->VertragsbestandteilLib->storeVertragsbestandteil($vb); - echo "Insert successful.\n"; - } - catch( Exception $ex ) - { - echo "Insert failed.\n"; - } - } - - public function testGehaltsbestandteilInsert() - { - $data = new stdClass(); - $data->gehaltsbestandteil_id = 2; - /* - $data->dienstverhaeltnis_id = 39; - $data->vertragsbestandteil_id = 123; - $data->gehaltstyp_kurzbz = 'zulage'; - $data->von = '2023-04-01'; - $data->bis = '2023-08-31'; - $data->anmerkung = 'test anmerkung'; - $data->grundbetrag = 100; - $data->betrag_valorisiert = 100; - $data->valorisierung = true; - */ - $data->auszahlungen = 12; - - $gb = new \vertragsbestandteil\Gehaltsbestandteil(); - $gb->hydrateByStdClass($data); - - print_r($gb->toStdClass()); - - $this->GehaltsbestandteilLib->storeGehaltsbestandteil($gb); - } -} diff --git a/application/controllers/system/TestSearch.php b/application/controllers/system/TestSearch.php deleted file mode 100644 index 1f5c66a1d..000000000 --- a/application/controllers/system/TestSearch.php +++ /dev/null @@ -1,44 +0,0 @@ - 'system/developer:r' - ) - ); - - // Loads WidgetLib - $this->load->library('WidgetLib'); - - // Loads phrases system - $this->loadPhrases( - array( - 'global', - 'ui', - 'filter' - ) - ); - } - - // ----------------------------------------------------------------------------------------------------------------- - // Public methods - - /** - * Everything has a beginning - */ - public function index() - { - $this->load->view('system/logs/testSearch.php'); - } -} diff --git a/application/controllers/system/TestVBform.php b/application/controllers/system/TestVBform.php deleted file mode 100644 index 9923bf05b..000000000 --- a/application/controllers/system/TestVBform.php +++ /dev/null @@ -1,32 +0,0 @@ - 'system/developer:r' - ) - ); - } - - // ----------------------------------------------------------------------------------------------------------------- - // Public methods - - /** - * Everything has a beginning - */ - public function index() - { - $this->load->view('system/logs/testVBform.php'); - } -} diff --git a/application/views/system/logs/testSearch.php b/application/views/system/logs/testSearch.php deleted file mode 100644 index 861adc53d..000000000 --- a/application/views/system/logs/testSearch.php +++ /dev/null @@ -1,59 +0,0 @@ - 'Test Search', - 'bootstrap5' => true, - 'fontawesome6' => true, - 'tabulator5' => true, - 'primevue3' => true, - 'axios027' => true, - 'vue3' => true, - 'filtercomponent' => true, - 'navigationcomponent' => true, - 'phrases' => array( - 'global' => array('mailAnXversandt'), - 'ui' => array('bitteEintragWaehlen') - ), - 'customCSSs' => array( - 'public/css/components/verticalsplit.css', - 'public/css/components/searchbar/searchbar.css', - 'public/css/components/primevue.css', - ), - 'customJSModules' => array('public/js/apps/TestSearch.js') - ); - - $this->load->view('templates/FHC-Header', $includesArray); -?> - -
- - - - -
-
-
-

- Test Search -

-
-
-
- - - - - - - - -
-
-
- -load->view('templates/FHC-Footer', $includesArray); ?> - diff --git a/application/views/system/logs/testVBform.php b/application/views/system/logs/testVBform.php deleted file mode 100644 index 566abb1cb..000000000 --- a/application/views/system/logs/testVBform.php +++ /dev/null @@ -1,16 +0,0 @@ - 'Test VBform', - 'bootstrap5' => true, - 'fontawesome6' => true, - 'vue3' => true, - 'customJSModules' => array('public/js/apps/vbform/vbform.js') - ); - - $this->load->view('templates/FHC-Header', $includesArray); -?> - -
- -load->view('templates/FHC-Footer', $includesArray); ?> - diff --git a/application/views/test/Admin.php b/application/views/test/Admin.php deleted file mode 100644 index c5fa8b64c..000000000 --- a/application/views/test/Admin.php +++ /dev/null @@ -1,33 +0,0 @@ -load->view( - 'templates/FHC-Header', - array( - 'title' => 'FH-Complete', - 'bootstrap5' => true, - 'fontawesome6' => true, - 'axios027' => true, - 'restclient' => true, - 'vue3' => true, - 'customJSModules' => ['public/js/apps/Test.js'], - 'customCSSs' => [ - 'public/css/components/dashboard.css' - ], - 'navigationcomponent' => true - ) -); -?> - -
- - -
-
-

Dashboard

-
- - - -
-
- -load->view('templates/FHC-Footer'); ?> diff --git a/application/views/test/Test.php b/application/views/test/Test.php deleted file mode 100644 index 328b45fba..000000000 --- a/application/views/test/Test.php +++ /dev/null @@ -1,33 +0,0 @@ -load->view( - 'templates/FHC-Header', - array( - 'title' => 'FH-Complete', - 'bootstrap5' => true, - 'fontawesome6' => true, - 'axios027' => true, - 'restclient' => true, - 'vue3' => true, - 'customJSModules' => ['public/js/apps/Test.js'], - 'customCSSs' => [ - 'public/css/components/dashboard.css' - ], - 'navigationcomponent' => true - ) -); -?> - -
- - -
-
-

Dashboard

-
- - - -
-
- -load->view('templates/FHC-Footer'); ?> diff --git a/public/js/api/search.js b/public/js/api/search.js index 4655d8fa8..f01551af2 100644 --- a/public/js/api/search.js +++ b/public/js/api/search.js @@ -19,9 +19,5 @@ export default { search(searchsettings) { const url = '/api/frontend/v1/searchbar/search'; return this.$fhcApi.post(url, searchsettings); - }, - searchdummy(searchsettings) { - const url = 'public/js/apps/api/dummyapi.php/Search'; - return this.$fhcApi.post(url, searchsettings); } -}; \ No newline at end of file +}; diff --git a/public/js/apps/Cis.js b/public/js/apps/Cis.js index 92c1b9ec7..c9d322e07 100644 --- a/public/js/apps/Cis.js +++ b/public/js/apps/Cis.js @@ -36,6 +36,12 @@ const app = Vue.createApp({ raum: { defaultaction: { type: "link", + renderif: function(data) { + if(data.content_id === "N/A"){ + return false; + } + return true; + }, action: function(data) { const link= FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + @@ -96,10 +102,10 @@ const app = Vue.createApp({ }, methods: { searchfunction: function(searchsettings) { - return Vue.$fhcapi.Search.search(searchsettings); + return Vue.$fhcapi.search.search(searchsettings); }, } }); app.use(FhcApi); app.use(Phrasen); -app.mount('#cis-header'); \ No newline at end of file +app.mount('#cis-header'); diff --git a/public/js/apps/TestSearch.js b/public/js/apps/TestSearch.js deleted file mode 100644 index f012d060f..000000000 --- a/public/js/apps/TestSearch.js +++ /dev/null @@ -1,196 +0,0 @@ -import {CoreFilterCmpt} from '../components/filter/Filter.js'; -import {CoreNavigationCmpt} from '../components/navigation/Navigation.js'; -import CoreVerticalsplit from "../components/verticalsplit/verticalsplit.js"; -import CoreSearchbar from "../components/searchbar/searchbar.js"; -import FhcApi from "../plugin/FhcApi.js"; - -const app = Vue.createApp({ - name: "TestSearchApp", - components: { - CoreNavigationCmpt, - CoreFilterCmpt, - CoreVerticalsplit, - CoreSearchbar - }, - data() { - return { - title: "Test Search", - appSideMenuEntries: {}, - searchbaroptions: { - types: [ - "person", - "raum", - "mitarbeiter", - "student", - "prestudent", - "document", - "cms", - "organisationunit" - ], - actions: { - person: { - defaultaction: { - type: "link", - action(data) { - //alert('person defaultaction ' + JSON.stringify(data)); - //window.location.href = data.profil; - return data.profil; - } - }, - childactions: [ - { - label: "testchildaction1", - icon: "fas fa-check-circle", - type: "function", - action(data) { - alert('person testchildaction 01 ' + JSON.stringify(data)); - } - }, - { - label: "testchildaction2", - icon: "fas fa-file-csv", - type: "function", - action(data) { - alert('person testchildaction 02 ' + JSON.stringify(data)); - } - } - ] - }, - raum: { - defaultaction: { - type: "function", - action(data) { - alert('raum defaultaction ' + JSON.stringify(data)); - } - }, - childactions: [ - { - label: "Rauminformation", - icon: "fas fa-info-circle", - type: "link", - action(data) { - return data.infolink; - } - }, - { - label: "Raumreservierung", - icon: "fas fa-bookmark", - type: "link", - action(data) { - return data.booklink; - } - } - ] - }, - employee: { - defaultaction: { - type: "function", - action(data) { - alert('employee defaultaction ' + JSON.stringify(data)); - } - }, - childactions: [ - { - label: "testchildaction1", - icon: "fas fa-address-book", - type: "function", - action(data) { - alert('employee testchildaction 01 ' + JSON.stringify(data)); - } - }, - { - label: "testchildaction2", - icon: "fas fa-user-slash", - type: "function", - action(data) { - alert('employee testchildaction 02 ' + JSON.stringify(data)); - } - }, - { - label: "testchildaction3", - icon: "fas fa-bell", - type: "function", - action(data) { - alert('employee testchildaction 03 ' + JSON.stringify(data)); - } - }, - { - label: "testchildaction4", - icon: "fas fa-calculator", - type: "function", - action(data) { - alert('employee testchildaction 04 ' + JSON.stringify(data)); - } - } - ] - }, - organisationunit: { - defaultaction: { - type: "function", - action(data) { - alert('organisationunit defaultaction ' + JSON.stringify(data)); - } - }, - childactions: [] - } - } - }, - searchbaroptions2: { - types: [ - "raum", - "organisationunit" - ], - actions: { - raum: { - defaultaction: { - type: "function", - action(data) { - alert('raum defaultaction ' + JSON.stringify(data)); - } - }, - childactions: [ - { - label: "Rauminformation", - icon: "fas fa-info-circle", - type: "link", - action(data) { - return data.infolink; - } - }, - { - label: "Raumreservierung", - icon: "fas fa-bookmark", - type: "link", - action(data) { - return data.booklink; - } - } - ] - }, - organisationunit: { - defaultaction: { - type: "function", - action(data) { - alert('organisationunit defaultaction ' + JSON.stringify(data)); - } - }, - childactions: [] - } - } - } - }; - }, - methods: { - newSideMenuEntryHandler(payload) { - this.appSideMenuEntries = payload; - }, - searchfunction(searchsettings) { - return this.$fhcApi.factory.search.search(searchsettings); - }, - searchfunctiondummy(searchsettings) { - return this.$fhcApi.factory.search.searchdummy(searchsettings); - } - } -}); -app.use(FhcApi) -app.mount('#main'); \ No newline at end of file diff --git a/public/js/apps/api/dummyapi.php b/public/js/apps/api/dummyapi.php deleted file mode 100644 index 515e72bcf..000000000 --- a/public/js/apps/api/dummyapi.php +++ /dev/null @@ -1,13 +0,0 @@ - \ No newline at end of file diff --git a/public/js/apps/api/fhcapifactory.js b/public/js/apps/api/fhcapifactory.js index 4b35b807a..fb652fb84 100644 --- a/public/js/apps/api/fhcapifactory.js +++ b/public/js/apps/api/fhcapifactory.js @@ -1,5 +1,5 @@ import Search from "./search.js"; export default { - "Search": Search, + "search": Search, }; diff --git a/public/js/apps/api/search.js b/public/js/apps/api/search.js index eddd3fe5b..9dd26531c 100644 --- a/public/js/apps/api/search.js +++ b/public/js/apps/api/search.js @@ -4,10 +4,5 @@ export default { + FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/components/SearchBar/search'; return axios.post(url, searchsettings); - }, - searchdummy: function(searchsettings) { - const url = FHC_JS_DATA_STORAGE_OBJECT.app_root - + 'public/js/apps/api/dummyapi.php/Search'; - return axios.post(url, searchsettings); } -}; \ No newline at end of file +};