diff --git a/public/js/components/searchbar/action.js b/public/js/components/searchbar/action.js
deleted file mode 100644
index a19ecfa97..000000000
--- a/public/js/components/searchbar/action.js
+++ /dev/null
@@ -1,44 +0,0 @@
-export default {
- props: {
- res: {
- type: Object
- },
- action: {
- type: Object
- },
- cssclass: {
- type: String,
- default: ''
- }
- },
- emits: [ 'actionexecuted' ],
- template: `
-
-
- Action
-
-
-
- Action
-
- `,
- methods: {
- getactionhref: function() {
- return (this.action.type === 'link') ? this.action.action(this.res)
- : 'javascript:void(0);';
- },
- 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
deleted file mode 100644
index 0fd164cea..000000000
--- a/public/js/components/searchbar/actions.js
+++ /dev/null
@@ -1,37 +0,0 @@
-import action from "./action.js";
-
-export default {
- props: [ "res", "actions" ],
- components: {
- action: action
- },
- emits: [ 'actionexecuted' ],
- template: `
-
-
- `,
- methods: {
- hasicon: function(index) {
- return (typeof this.actions[index].icon !== "undefined");
- },
- 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/employee.js b/public/js/components/searchbar/employee.js
deleted file mode 100644
index 65eb93d1f..000000000
--- a/public/js/components/searchbar/employee.js
+++ /dev/null
@@ -1,89 +0,0 @@
-import action from "./action.js";
-import actions from "./actions.js";
-
-export default {
- props: [ "res", "actions" ],
- components: {
- action: action,
- actions: actions
- },
- emits: [ 'actionexecuted' ],
- template: `
-
+
+
+ `
+};
\ No newline at end of file
diff --git a/public/js/components/searchbar/result/dms.js b/public/js/components/searchbar/result/dms.js
new file mode 100644
index 000000000..adb0172a3
--- /dev/null
+++ b/public/js/components/searchbar/result/dms.js
@@ -0,0 +1,75 @@
+import TemplateFrame from "./template/frame.js";
+
+export default {
+ name: 'SearchbarResultDms',
+ components: {
+ TemplateFrame
+ },
+ emits: [ 'actionexecuted' ],
+ props: {
+ res: Object,
+ actions: Object
+ },
+ computed: {
+ icon() {
+ switch (this.res.mimetype) {
+ case 'application/pdf':
+ return 'file-pdf';
+ case 'application/vnd.openxmlformats-officedocument.wordprocessingml.document':
+ case 'application/msword':
+ return 'file-word';
+ case 'application/vnd.openxmlformats-officedocument.presentationml.presentation':
+ case 'application/mspowerpoint':
+ return 'file-powerpoint';
+ case 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet':
+ case 'application/vnd.ms-excel':
+ return 'file-excel';
+ case 'application/x-zip':
+ case 'application/zip':
+ return 'file-zipper';
+ case 'image/jpeg':
+ case 'image/gif':
+ case 'image/png':
+ return 'file-image';
+ default:
+ return 'file';
+ }
+ }
+ },
+ template: `
+
+
+ `
+};
\ No newline at end of file
diff --git a/public/js/components/searchbar/result/employee.js b/public/js/components/searchbar/result/employee.js
new file mode 100644
index 000000000..d9d2332a5
--- /dev/null
+++ b/public/js/components/searchbar/result/employee.js
@@ -0,0 +1,60 @@
+import TemplateFrame from "./template/frame.js";
+
+export default {
+ name: 'SearchbarResultEmployee',
+ components: {
+ TemplateFrame
+ },
+ emits: [ 'actionexecuted' ],
+ props: {
+ res: Object,
+ actions: Object
+ },
+ template: `
+
+
+ `
+};
\ No newline at end of file
diff --git a/public/js/components/searchbar/result/mergedperson.js b/public/js/components/searchbar/result/mergedperson.js
new file mode 100644
index 000000000..2b3397fde
--- /dev/null
+++ b/public/js/components/searchbar/result/mergedperson.js
@@ -0,0 +1,209 @@
+import TemplateFrame from "./template/frame.js";
+import TemplateAction from "./template/action.js";
+
+export default {
+ name: 'SearchbarResultMergedperson',
+ components: {
+ TemplateFrame,
+ TemplateAction
+ },
+ emits: [ 'actionexecuted' ],
+ props: {
+ mode: String,
+ res: Object,
+ actions: Object
+ },
+ computed: {
+ person() {
+ // Cummulate all emails
+ const email = this.res.list.reduce((a, c) => [...a, ...(Array.isArray(c.email) ? c.email : [c.email])], []);
+
+ // Use person entry if available (with cummulated emails)
+ const person = this.res.list.find(item => item.type == 'person');
+ if (person)
+ return {...person, email};
+
+ // Those properties should be the same in all entries
+ const { person_id, name } = this.res.list[0];
+ // Get first photo (prefer student photo if available)
+ let photo_url;
+ if (this.mode == 'simple') {
+ let foto = (this.students ? this.students.find(el => el.foto) : null)?.foto;
+ if (foto)
+ foto = 'data:image/jpeg;base64,' + foto;
+ photo_url = foto || this.employee?.photo_url;
+ } else
+ photo_url = ((this.students ? this.students.find(el => el.photo_url) : null) || this.employee)?.photo_url;
+
+ return { person_id, name, photo_url, email };
+ },
+ employee() {
+ return this.res.list.find(item => [
+ 'employee',
+ 'unassigned_employee',
+ 'mitarbeiter',
+ 'mitarbeiter_ohne_zuordnung'
+ ].includes(item.type)) || null;
+ },
+ students() {
+ const students = this.res.list.filter(item => [
+ 'student',
+ 'prestudent',
+ 'studentcis',
+ 'studentStv'
+ ].includes(item.type))
+ .filter((item, idx, arr) => {
+ if (item.type === 'prestudent') {
+ return true;
+ }
+
+ let prestudentwithsameuidexists = arr.some(tmpitem => {
+ return tmpitem.uid === item.uid && tmpitem.type === 'prestudent';
+ });
+
+ if (prestudentwithsameuidexists) {
+ return false;
+ }
+ return true;
+ }).sort((a, b) => (a.sort || 0) - (b.sort || 0));
+ return students.length ? students : null;
+ },
+ emails() {
+ // Remove duplicates
+ return new Set(this.person.email);
+ },
+ telurl() {
+ return 'tel:' + this.employee?.phone;
+ },
+ inaktiv() {
+ return this.res.list.some(item => item?.aktiv === false);
+ }
+ },
+ template: `
+
+
+ `
+};
\ No newline at end of file
diff --git a/public/js/components/searchbar/result/mergedstudent.js b/public/js/components/searchbar/result/mergedstudent.js
new file mode 100644
index 000000000..7c59b0bf8
--- /dev/null
+++ b/public/js/components/searchbar/result/mergedstudent.js
@@ -0,0 +1,39 @@
+import ResultPrestudent from "./prestudent.js";
+import ResultStudent from "./student.js";
+
+export default {
+name: 'SearchbarResultMergedstudent',
+ components: {
+ ResultPrestudent,
+ ResultStudent
+ },
+ emits: [ 'actionexecuted' ],
+ props: {
+ mode: String,
+ res: Object,
+ actions: Object
+ },
+ computed: {
+ prestudent() {
+ const prestudent = this.res.list.filter(item => item.type == 'prestudent');
+ return prestudent.pop();
+ }
+ },
+ template: `
+
+
+ `
+};
\ No newline at end of file
diff --git a/public/js/components/searchbar/result/person.js b/public/js/components/searchbar/result/person.js
new file mode 100644
index 000000000..da920be2c
--- /dev/null
+++ b/public/js/components/searchbar/result/person.js
@@ -0,0 +1,45 @@
+import TemplateFrame from "./template/frame.js";
+
+export default {
+ name: 'SearchbarResultPerson',
+ components: {
+ TemplateFrame
+ },
+ emits: [ 'actionexecuted' ],
+ props: {
+ res: Object,
+ actions: Object
+ },
+ computed: {
+ emails() {
+ return new Set(this.res.email);
+ }
+ },
+ template: `
+
+
+ `
+};
\ No newline at end of file
diff --git a/public/js/components/searchbar/result/prestudent.js b/public/js/components/searchbar/result/prestudent.js
new file mode 100644
index 000000000..f142fcdaa
--- /dev/null
+++ b/public/js/components/searchbar/result/prestudent.js
@@ -0,0 +1,84 @@
+import TemplateFrame from "./template/frame.js";
+
+export default {
+ name: 'SearchbarResultPrestudent',
+ components: {
+ TemplateFrame
+ },
+ emits: [ 'actionexecuted' ],
+ props: {
+ mode: String,
+ res: Object,
+ actions: Object
+ },
+ computed: {
+ title() {
+ if (this.mode == 'simple')
+ return this.res.name;
+ return this.res.name + ' (' + this.res.status + ' ' + this.res.stg_kuerzel + ')';
+ },
+ photo_url() {
+ if (this.mode != 'simple')
+ return this.res.photo_url;
+ if (this.res.foto)
+ return 'data:image/jpeg;base64,' + this.res.foto;
+ return null;
+ },
+ emails() {
+ if (this.mode == 'simple')
+ return new Set([this.res.email]);
+ return new Set(this.res.email);
+ }
+ },
+ template: `
+
+
+ `
+};
\ No newline at end of file
diff --git a/public/js/components/searchbar/result/room.js b/public/js/components/searchbar/result/room.js
new file mode 100644
index 000000000..39e50395d
--- /dev/null
+++ b/public/js/components/searchbar/result/room.js
@@ -0,0 +1,80 @@
+import TemplateFrame from "./template/frame.js";
+
+export default {
+ name: 'SearchbarResultRoom',
+ components: {
+ TemplateFrame
+ },
+ emits: [ 'actionexecuted' ],
+ props: {
+ mode: String,
+ res: Object,
+ actions: Object
+ },
+ computed: {
+ equipment() {
+ if (!this.res.equipment)
+ return "";
+ return this.res.equipment.replace(new RegExp('
', 'ig'), ''); + }, + address() { + let address = this.res.zip || ''; + if (this.res.city) + address += (address ? ' ' : '') + this.res.city; + if (this.res.street) + address += (address ? ', ' : '') + this.res.street; + if (this.res.floor) + address += (address ? ' / ' : '') + this.$p.t('search/result_address_floor', this.res); + + return address || this.$p.t('search/result_address_none'); + } + }, + template: ` +
+
+ `
+};
\ No newline at end of file
diff --git a/public/js/components/searchbar/result/student.js b/public/js/components/searchbar/result/student.js
new file mode 100644
index 000000000..db31bb689
--- /dev/null
+++ b/public/js/components/searchbar/result/student.js
@@ -0,0 +1,67 @@
+import TemplateFrame from "./template/frame.js";
+
+export default {
+ name: 'SearchbarResultStudent',
+ components: {
+ TemplateFrame
+ },
+ emits: [ 'actionexecuted' ],
+ props: {
+ mode: String,
+ res: Object,
+ actions: Object
+ },
+ computed: {
+ photo_url() {
+ if (this.mode != 'simple')
+ return this.res.photo_url;
+ if (this.res.foto)
+ return 'data:image/jpeg;base64,' + this.res.foto;
+ return null;
+ },
+ emails() {
+ if (this.mode == 'simple')
+ return new Set([this.res.email]);
+ return new Set(this.res.email);
+ }
+ },
+ template: `
+
+
+ `
+};
\ No newline at end of file
diff --git a/public/js/components/searchbar/result/template/action.js b/public/js/components/searchbar/result/template/action.js
new file mode 100644
index 000000000..7c50eb134
--- /dev/null
+++ b/public/js/components/searchbar/result/template/action.js
@@ -0,0 +1,29 @@
+export default {
+ name: 'SearchbarResultTemplateAction',
+ emits: [ 'actionexecuted' ],
+ props: {
+ res: Object,
+ action: Object
+ },
+ computed: {
+ actionHref() {
+ if (this.action.type !== 'link')
+ return 'javascript:void(0);';
+ return typeof this.action.action === 'function'
+ ? this.action.action(this.res)
+ : this.action.action;
+ }
+ },
+ methods: {
+ actionFunc() {
+ if (this.action.type !== 'function')
+ return;
+ this.action.action(this.res);
+ this.$emit('actionexecuted');
+ }
+ },
+ template: `
+
+ {{ $p.t('search/action_default_label') }}
+ `
+};
\ No newline at end of file
diff --git a/public/js/components/searchbar/result/template/actions.js b/public/js/components/searchbar/result/template/actions.js
new file mode 100644
index 000000000..726fef4dd
--- /dev/null
+++ b/public/js/components/searchbar/result/template/actions.js
@@ -0,0 +1,27 @@
+import ResultAction from "./action.js";
+
+export default {
+ name: 'SearchbarResultTemplateActions',
+ components: {
+ ResultAction
+ },
+ emits: [ 'actionexecuted' ],
+ props: {
+ res: Object,
+ actions: Array
+ },
+ template: `
+ `
+};
\ No newline at end of file
diff --git a/public/js/components/searchbar/result/template/frame.js b/public/js/components/searchbar/result/template/frame.js
new file mode 100644
index 000000000..5c8f8aa02
--- /dev/null
+++ b/public/js/components/searchbar/result/template/frame.js
@@ -0,0 +1,59 @@
+import ResultAction from "./action.js";
+import ResultActions from "./actions.js";
+
+export default {
+ name: 'SearchbarResultTemplateFrame',
+ components: {
+ ResultAction,
+ ResultActions
+ },
+ emits: [ 'actionexecuted' ],
+ props: {
+ res: Object,
+ actions: Object,
+ title: String,
+ image: String,
+ imageFallback: String
+ },
+ template: `
+
-
-
- `,
- methods: {
- },
- computed: {
- mailtourl: function() {
- return 'mailto:' + this.res.email;
- },
- telurl: function() {
- return 'tel:' + this.res.phone;
- }
- }
-};
\ No newline at end of file
diff --git a/public/js/components/searchbar/organisationunit.js b/public/js/components/searchbar/organisationunit.js
deleted file mode 100644
index 18e11c861..000000000
--- a/public/js/components/searchbar/organisationunit.js
+++ /dev/null
@@ -1,83 +0,0 @@
-import action from "./action.js";
-import actions from "./actions.js";
-
-export default {
- props: [ "res", "actions" ],
- components: {
- action: action,
- actions: actions
- },
- emits: [ 'actionexecuted' ],
- template: `
-
- `,
- methods: {
- },
- computed: {
- mailtourl: function() {
- return 'mailto:' + this.res.mailgroup;
- },
- telurl: function() {
- return 'tel:' + this.res.phone;
- }
- }
-};
\ No newline at end of file
diff --git a/public/js/components/searchbar/person.js b/public/js/components/searchbar/person.js
deleted file mode 100644
index 8e74a714f..000000000
--- a/public/js/components/searchbar/person.js
+++ /dev/null
@@ -1,56 +0,0 @@
-import action from "./action.js";
-import actions from "./actions.js";
-
-export default {
- props: [ "res", "actions" ],
- components: {
- action: action,
- actions: actions
- },
- emits: [ 'actionexecuted' ],
- template: `
-
-
-
-
-
- ![]()
-
-
-
-
-
-
-
-
- `,
- methods: {
- },
- computed: {
- mailtourl: function() {
- return 'mailto:' + this.res.mail;
- }
- }
-};
\ No newline at end of file
diff --git a/public/js/components/searchbar/prestudent.js b/public/js/components/searchbar/prestudent.js
deleted file mode 100644
index 2887924e5..000000000
--- a/public/js/components/searchbar/prestudent.js
+++ /dev/null
@@ -1,89 +0,0 @@
-import action from "./action.js";
-import actions from "./actions.js";
-
-export default {
- props: [ "res", "actions" ],
- components: {
- action: action,
- actions: actions
- },
- emits: [ 'actionexecuted' ],
- template: `
-
-
-
-
-
- ![]()
-
-
-
-
-
-
-
-
- `,
- methods: {
- },
- computed: {
- mailtourl: function() {
- return 'mailto:' + this.res.email;
- }
- }
-};
\ No newline at end of file
diff --git a/public/js/components/searchbar/raum.js b/public/js/components/searchbar/raum.js
deleted file mode 100644
index a64251356..000000000
--- a/public/js/components/searchbar/raum.js
+++ /dev/null
@@ -1,54 +0,0 @@
-import action from "./action.js";
-import actions from "./actions.js";
-
-export default {
- props: [ "res", "actions" ],
- components: {
- action: action,
- actions: actions
- },
- emits: [ 'actionexecuted' ],
- template: /*html*/`
-
- `,
- methods: {
- }
-};
\ No newline at end of file
diff --git a/public/js/components/searchbar/result/cms.js b/public/js/components/searchbar/result/cms.js
new file mode 100644
index 000000000..dfd2b575a
--- /dev/null
+++ b/public/js/components/searchbar/result/cms.js
@@ -0,0 +1,75 @@
+import TemplateFrame from "./template/frame.js";
+
+export default {
+ name: 'SearchbarResultCms',
+ components: {
+ TemplateFrame
+ },
+ emits: [ 'actionexecuted' ],
+ props: {
+ res: Object,
+ actions: Object
+ },
+ inject: [
+ 'query'
+ ],
+ computed: {
+ preview() {
+ if (this.res.template_kurzbz != 'redirect') {
+ let text = this.res.content.replace(//ig, '').replace(/<[^>]+>/ig, '').replace(/^\s+|\s+$/g, '');
+
+ if (text.length > 1000) {
+ // NOTE(chris): focus on searched text!
+ let lower = text.toLowerCase();
+ let firstOccurence = Math.min(this.query.split(' ').reduce((a, c) => {
+ // NOTE(chris): filter query for words that affects the content field and get the lowest index of them
+ if (c == 'or')
+ return a;
+ let i = c.indexOf(':');
+ if (i < 0 || (i > 0 && ['content', 'inhalt'].includes(c.split(':')[0]))) {
+ let posInText = lower.indexOf(c);
+ if (posInText >= 0)
+ a.push(posInText);
+ }
+ return a;
+ }, []));
+
+ if (firstOccurence) {
+ if (firstOccurence + 997 >= text.length) {
+ firstOccurence = text.length - 997;
+ if (firstOccurence > 0)
+ return '...' + text.substr(firstOccurence, 997);
+ } else {
+ return '...' + text.substr(firstOccurence, 994) + '...';
+ }
+ }
+
+ text = text.substr(0, 997) + '...';
+ }
+
+ return text;
+ }
+
+ let url = this.res.content_url;
+ if (url.substr(0, 16) == '../index.ci.php/')
+ url = this.$fhcApi.getUri(url.substr(16));
+ else if (url.substr(0, 3) == '../')
+ url = FHC_JS_DATA_STORAGE_OBJECT.app_root.replace(/\/+$/, '') + url.substr(2);
+ return '' + url + '';
+ }
+ },
+ template: `
+
-
-
-
-
- ![]()
-
-
-
-
-
- ', 'ig'), ''); + }, + address() { + let address = this.res.zip || ''; + if (this.res.city) + address += (address ? ' ' : '') + this.res.city; + if (this.res.street) + address += (address ? ', ' : '') + this.res.street; + if (this.res.floor) + address += (address ? ' / ' : '') + this.$p.t('search/result_address_floor', this.res); + + return address || this.$p.t('search/result_address_none'); + } + }, + template: ` +
+
`
+};
\ No newline at end of file
diff --git a/public/js/components/searchbar/searchbar.js b/public/js/components/searchbar/searchbar.js
index 197800c29..6a41fe2f5 100644
--- a/public/js/components/searchbar/searchbar.js
+++ b/public/js/components/searchbar/searchbar.js
@@ -1,137 +1,206 @@
-import person from "./person.js";
-import raum from "./raum.js";
-import employee from "./employee.js";
-import organisationunit from "./organisationunit.js";
-import student from "./student.js";
-import prestudent from "./prestudent.js";
+import person from "./result/person.js";
+import room from "./result/room.js";
+import employee from "./result/employee.js";
+import organisationunit from "./result/organisationunit.js";
+import student from "./result/student.js";
+import prestudent from "./result/prestudent.js";
+import dms from "./result/dms.js";
+import cms from "./result/cms.js";
+import mergedStudent from "./result/mergedstudent.js";
+import mergedPerson from "./result/mergedperson.js";
export default {
+ name: "FhcSearchbar",
+ components: {
+ person,
+ room,
+ employee,
+ organisationunit,
+ student,
+ prestudent,
+ dms,
+ cms,
+ mergedStudent,
+ mergedPerson
+ },
props: [ "searchoptions", "searchfunction" ],
+ provide() {
+ return {
+ query: Vue.computed(() => this.lastQuery)
+ };
+ },
data: function() {
return {
searchtimer: null,
hidetimer: null,
searchsettings: {
searchstr: this.getSearchStr(),
- types: this.getSearchTypes(),
+ types: this.getInitiallySelectedTypes(),
},
searchresult: [],
+ searchmode: '',
showresult: false,
searching: false,
error: null,
- settingsDropdown:null,
+ abortController: null,
+ settingsDropdown: null,
+ lastQuery: ''
};
},
- components: {
- person: person,
- raum: raum,
- employee: employee,
- organisationunit: organisationunit,
- student: student,
- prestudent: prestudent
- },
- template: /*html*/`
-
+
+
+
+ ![]()
+
+
+
+
+
+
+
+