{{ p.t('lehre/noLvFound') }}
diff --git a/public/js/components/searchbar/action.js b/public/js/components/searchbar/action.js
index 699d5f8c7..f4745a08e 100644
--- a/public/js/components/searchbar/action.js
+++ b/public/js/components/searchbar/action.js
@@ -13,10 +13,15 @@ export default {
},
emits: [ 'actionexecuted' ],
template: `
-
- Action
-
+
+
+ Action
+
+
+
+ Action
+
`,
methods: {
getactionhref: function() {
@@ -26,6 +31,13 @@ export default {
execaction: function() {
this.action.action(this.res);
this.$emit('actionexecuted');
- }
+ },
+ renderif: function() {
+ if(this.action?.renderif === undefined) {
+ return true;
+ }
+
+ return this.action.renderif(this.res);
+ }
}
};
\ No newline at end of file
diff --git a/public/js/components/searchbar/actions.js b/public/js/components/searchbar/actions.js
index ff9e25e12..0fd164cea 100644
--- a/public/js/components/searchbar/actions.js
+++ b/public/js/components/searchbar/actions.js
@@ -8,12 +8,14 @@ export default {
emits: [ 'actionexecuted' ],
template: `
- -
+
+
-
{{ action.label }}
+
`,
@@ -23,6 +25,13 @@ export default {
},
geticonclass: function(index) {
return this.actions[index].icon;
- }
+ },
+ renderif: function(action) {
+ if(action?.renderif === undefined) {
+ return true;
+ }
+
+ return action.renderif(this.res);
+ }
}
};
\ No newline at end of file
diff --git a/public/js/components/searchbar/raum.js b/public/js/components/searchbar/raum.js
index a1fc300fb..a0e0e464d 100644
--- a/public/js/components/searchbar/raum.js
+++ b/public/js/components/searchbar/raum.js
@@ -7,15 +7,6 @@ export default {
action: action,
actions: actions
},
- created(){
- //! this should be the default action for a raum
- this.actions.defaultaction = {
- type: "link",
- action: function(data) {
- return FHC_JS_DATA_STORAGE_OBJECT.app_root+'cms/content.php?content_id='+data.content_id;
- }
- };
- },
emits: [ 'actionexecuted' ],
template: /*html*/`
diff --git a/public/js/components/searchbar/searchbar.js b/public/js/components/searchbar/searchbar.js
index a828b2cfd..de408fa77 100644
--- a/public/js/components/searchbar/searchbar.js
+++ b/public/js/components/searchbar/searchbar.js
@@ -6,7 +6,7 @@ import student from "./student.js";
import prestudent from "./prestudent.js";
export default {
- props: [ "searchoptions", "searchfunction","selectedtypes" ],
+ props: [ "searchoptions", "searchfunction" ],
emits: ['showSettings'],
data: function() {
return {
@@ -33,7 +33,7 @@ export default {
prestudent: prestudent
},
template: /*html*/`
-
`,
watch:{
- 'searchsettings.types'(newValue){
+ 'searchsettings.types': function (newValue){
this.search();
},
},
@@ -92,36 +92,10 @@ export default {
});
},
methods: {
- getActionsForRoom: function(res){
- res.booklink= FHC_JS_DATA_STORAGE_OBJECT.app_root +
- FHC_JS_DATA_STORAGE_OBJECT.ci_router +
- `/CisVue/Cms/getRoomInformation/${res.ort_kurzbz}`;
-
- if(res.content_id !=="N/A"){
- res.infolink= FHC_JS_DATA_STORAGE_OBJECT.app_root +
- FHC_JS_DATA_STORAGE_OBJECT.ci_router +
- `/CisVue/Cms/content/${res.content_id}`;
- }
-
- let child = this.searchoptions.actions.raum.childactions.filter((child)=>{
- if(child.label =="Rauminformation" && res.content_id =="N/A"){
- return false;
- }
- return true;
- });
-
- let computedActions = {
- childactions:child,
- defaultaction:this.searchoptions.actions.raum.defaultaction
- }
- return computedActions;
-
-
- },
updateSearchOptions: function() {
this.searchsettings.types = [];
- for( const idx in this.selectedtypes ) {
- this.searchsettings.types.push(this.selectedtypes[idx]);
+ for( const idx in this.searchoptions.types ) {
+ this.searchsettings.types.push(this.searchoptions.types[idx]);
}
},
calcSearchResultExtent: function() {
@@ -135,7 +109,7 @@ export default {
if( this.searchtimer !== null ) {
clearTimeout(this.searchtimer);
}
- if( this.searchsettings.searchstr.length >= 3 ) {
+ if( this.searchsettings.searchstr.length >= 2 ) {
this.calcSearchResultExtent();
this.searchtimer = setTimeout(
this.callsearchapi,
@@ -145,11 +119,16 @@ export default {
this.showresult = false;
}
},
- callsearchapi: function() {
+ callsearchapi: function() {
this.error = null;
- this.searchresult.splice(0,this.searchresult.length);
+ this.searchresult.splice(0, this.searchresult.length);
this.searching = true;
- this.showsearchresult();
+ this.showsearchresult();
+ if(this.searchsettings.types.length === 0) {
+ this.error = 'Kein Ergebnistyp ausgewählt. Bitte mindestens einen Ergebnistyp auswählen.';
+ this.searching = false;
+ return;
+ }
this.searchfunction(this.searchsettings)
.then(response=>{
if( response.data?.error === 1 ) {
@@ -177,7 +156,7 @@ export default {
window.removeEventListener('resize', this.calcSearchResultExtent);
},
showsearchresult: function() {
- if( this.searchsettings.searchstr.length >= 3 ) {
+ if( this.searchsettings.searchstr.length >= 2 ) {
this.showresult = true;
window.addEventListener('resize', this.calcSearchResultExtent);
}
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 5d08f0e96..8e66bd17e 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -37116,6 +37116,26 @@ array(
'insertvon' => 'system'
)
)
+ ),
+ array(
+ 'app' => 'core',
+ 'category' => 'lehre',
+ 'phrase' => 'stundenplan',
+ 'insertvon' => 'system',
+ 'phrases' => array(
+ array(
+ 'sprache' => 'German',
+ 'text' => 'Stundenplan',
+ 'description' => '',
+ 'insertvon' => 'system'
+ ),
+ array(
+ 'sprache' => 'English',
+ 'text' => 'Timetable',
+ 'description' => '',
+ 'insertvon' => 'system'
+ )
+ )
)
// CIS4 phrases from legacy code end
);