hopfma/om
4
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

extended search

Browse Source
This commit is contained in:
Senta Mandutz 2019-07-21 14:12:16 +02:00
parent 70befa7c4d
commit 5a4faca86f
4 changed files with 38 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
public/index.html
View File

@ -182,11 +182,6 @@
<script> <script>
var isSearchActive = false; var isSearchActive = false;
var tagArray = ["lorem"]; var tagArray = ["lorem"];
const dat = [
'th',
'efi',
'wichtig',
];
</script> </script>
@ -211,7 +206,7 @@
searchtext: "", searchtext: "",
//isSearchActiv: false, //isSearchActiv: false,
selected: [], selected: [],
taglist: dat, taglist: data,
}; };
}, },
computed: { computed: {
@ -227,7 +222,7 @@
methods: { methods: {
getFilteredTags(text) { getFilteredTags(text) {
this.taglist = dat.filter((option) => { this.taglist = data.filter((option) => {
return option return option
.toString() .toString()
.toLowerCase() .toLowerCase()
@ -240,7 +235,8 @@
console.info(tagArray); console.info(tagArray);
}, },
search: function() { search: function() {
searching(this.searchtext);
searching(this.searchtext);
}, },
list_messages: function() { list_messages: function() {
messages(); messages();
@ -252,12 +248,14 @@
}) })
.done(jd => { .done(jd => {
// NICHT SO wg. Vue: _messagelist = jd; // NICHT SO wg. Vue: _messagelist = jd;
_taglist.splice(0, _taglist.length); if(data == ""){
_taglist.push.apply(_taglist, jd); _taglist.splice(0, _taglist.length);
console.log("tag: jd: " + jd); _taglist.push.apply(_taglist, jd);
for (var e in jd) { console.log("tag: jd: " + jd);
if (!_tags[jd[e]]) { for (var e in jd) {
get_insert_tag(jd[e]); if (!_tags[jd[e]]) {
get_insert_tag(jd[e]);
}
} }
} }
}).fail(function(e, f, g) { }).fail(function(e, f, g) {
@ -285,7 +283,7 @@
url: "api/tag/" + id, url: "api/tag/" + id,
method: "GET" method: "GET"
}).done(function(tag) { }).done(function(tag) {
dat.push("#" + tag.name); data.push("#" + tag.name);
console.log("it worked!"); console.log("it worked!");
}).fail(function(e, f, g) { }).fail(function(e, f, g) {
console.log("cannot load " + id + ".json: " + e + f + g); console.log("cannot load " + id + ".json: " + e + f + g);
@ -300,6 +298,7 @@
method: "GET" method: "GET"
}).done(jd => { }).done(jd => {
// NICHT SO wg. Vue: _messagelist = jd; // NICHT SO wg. Vue: _messagelist = jd;
router.push('/home');
_messagelist.splice(0, _messagelist.length); _messagelist.splice(0, _messagelist.length);
_messagelist.push.apply(_messagelist, jd); _messagelist.push.apply(_messagelist, jd);
//console.log("jd: "+jd); //console.log("jd: "+jd);

23
public/routes/createMessage.js
View File

@ -1,9 +1,5 @@
var tagArray = []; var tagArray = [];
const data=[ const data=[];
'th',
'efi',
'wichtig',
];
const CreateMsgRouter = { const CreateMsgRouter = {
template: ` template: `
<div class="content card om-card"> <div class="content card om-card">
@ -90,12 +86,15 @@ const CreateMsgRouter = {
$.ajax({url: "api/tag/ids",method: "GET"}) $.ajax({url: "api/tag/ids",method: "GET"})
.done(jd => { .done(jd => {
// NICHT SO wg. Vue: _messagelist = jd; // NICHT SO wg. Vue: _messagelist = jd;
_taglist.splice(0, _taglist.length); console.log("DATA: "+data);
_taglist.push.apply(_taglist, jd); if(data == ""){
console.log("tag: jd: " + jd); _taglist.splice(0, _taglist.length);
for (var e in jd) { _taglist.push.apply(_taglist, jd);
if (!_tags[jd[e]]) { console.log("tag: jd: " + jd);
get_insert_tag(jd[e]); for (var e in jd) {
if (!_tags[jd[e]]) {
get_insert_tag(jd[e]);
}
} }
} }
}).fail(function (e, f, g) { }).fail(function (e, f, g) {
@ -104,7 +103,7 @@ const CreateMsgRouter = {
} }
}, },
mounted: function () { mounted: function () {
this.list_tags(); //this.list_tags();
if ($(this).bootstrapMaterialDesign) if ($(this).bootstrapMaterialDesign)
$(this).bootstrapMaterialDesign(); $(this).bootstrapMaterialDesign();
}, },

23
public/routes/files.js
View File

@ -2,8 +2,10 @@ var tagArray = [];
const FileRouter = { const FileRouter = {
template: ` template: `
<div class="content"> <div>
<h4>Erweiterte Suche</h4> <div class="content">
<h4 >Erweiterte Suche</h4>
</div>
<b-field label="Suche nach"> <b-field label="Suche nach">
<b-select <b-select
placeholder="Wähle eine Suchform" placeholder="Wähle eine Suchform"
@ -21,16 +23,16 @@ const FileRouter = {
</b-field> </b-field>
<b-field v-if="selectedOptions=='tags'"> <b-field v-if="selectedOptions=='tags'">
<b-autocomplete rounded v-model="searchtext" <b-autocomplete v-model="searchtext"
:data="filteredDataArray" :data="filteredDataArray"
placeholder="suche..." icon="magnify" placeholder="#" icon="label"
@select="option => selected = option"> @select="option => selected = option">
</b-autocomplete> </b-autocomplete>
</b-field> </b-field>
<b-button type="is-primary" @click="search">SUCHE</b-button> <b-button type="is-primary" @click="search">SUCHE</b-button>
<div id="om-msg-cards"> <div id="om-msg-cards" v-if="isExtendedSearch==true">
<MsgCard <MsgCard
v-for="id in messagelist.slice().reverse()" v-for="id in messagelist.slice().reverse()"
:key="id" :key="id"
@ -47,6 +49,7 @@ const FileRouter = {
taglist: data, taglist: data,
messagelist: _messagelist, messagelist: _messagelist,
messages: _messages, messages: _messages,
isExtendedSearch: false,
} }
}, },
computed: { computed: {
@ -63,10 +66,6 @@ const FileRouter = {
list_messages: function () { list_messages: function () {
messages(); messages();
}, },
saveTagsToArray: function () {
tagArray = this.selected;
console.info(tagArray);
},
getFilteredTags(text) { getFilteredTags(text) {
this.taglist = data.filter((option) => { this.taglist = data.filter((option) => {
return option return option
@ -74,7 +73,6 @@ const FileRouter = {
.toLowerCase() .toLowerCase()
.indexOf(text.toLowerCase()) >= 0 .indexOf(text.toLowerCase()) >= 0
}) })
this.search();
}, },
list_tags: function () { list_tags: function () {
$.ajax({ $.ajax({
@ -83,6 +81,7 @@ const FileRouter = {
}) })
.done(jd => { .done(jd => {
// NICHT SO wg. Vue: _messagelist = jd; // NICHT SO wg. Vue: _messagelist = jd;
if(data == ""){
_taglist.splice(0, _taglist.length); _taglist.splice(0, _taglist.length);
_taglist.push.apply(_taglist, jd); _taglist.push.apply(_taglist, jd);
console.log("tag: jd: " + jd); console.log("tag: jd: " + jd);
@ -91,6 +90,7 @@ const FileRouter = {
get_insert_tag(jd[e]); get_insert_tag(jd[e]);
} }
} }
}
}).fail(function (e, f, g) { }).fail(function (e, f, g) {
console.log("err: " + e + f + g); console.log("err: " + e + f + g);
}); });
@ -101,6 +101,7 @@ const FileRouter = {
}, },
search: function () { search: function () {
searching(this.searchtext); searching(this.searchtext);
this.isExtendedSearch=true;
}, },
list_messages: function () { list_messages: function () {
messages(); messages();
@ -108,7 +109,7 @@ const FileRouter = {
}, },
mounted: function () { mounted: function () {
//this.search(); //this.search();
this.list_tags(); //this.list_tags();
//this.list_messages(); //this.list_messages();
}, },
}; };

2
server/dbs.js
View File

@ -59,7 +59,7 @@ const dbs = {
get: function(req, res) { get: function(req, res) {
model.Messages.find( model.Messages.find(
{$text: {$search: req.params.phrase}}) {$text: {$search: req.params.phrase}})
.sort({tag:1, user:1, message:1, subject:1}) .sort({tag:-1})
.exec().then(results => { .exec().then(results => {
//selects id from message: //selects id from message:
var parsed = []; var parsed = [];