From 003cc8e07fcc91ec47e01c326ccde840adf874d5 Mon Sep 17 00:00:00 2001 From: Avinash Agarwal Date: Fri, 5 Apr 2019 13:33:25 +0530 Subject: [PATCH] separate section for hidden quesions added --- client/views/list/list.html | 14 ++++++++++++- client/views/list/list.js | 40 ++++++++++++++++++++++++++++++++++--- client/views/list/list.scss | 7 +++++++ 3 files changed, 57 insertions(+), 4 deletions(-) diff --git a/client/views/list/list.html b/client/views/list/list.html index 02b50341..ddd6aa45 100644 --- a/client/views/list/list.html +++ b/client/views/list/list.html @@ -35,7 +35,19 @@

Moderator Interface

{{> question_div}} {{/if}} {{/each}} - + + {{#if hiddenQuestionsPresent}} +
+
+ {{#each question}} + {{#if invisible}} + {{#if adminMod}} + {{> question_div}} + {{/if}} + {{/if}} + {{/each}} +
+ {{/if}} {{> footer}} diff --git a/client/views/list/list.js b/client/views/list/list.js index b6d40cae..3b4e8405 100644 --- a/client/views/list/list.js +++ b/client/views/list/list.js @@ -270,10 +270,15 @@ Template.list.helpers({ if (this.state !== 'disabled') return true; if (isPresenting === true) return false; - + }, + invisible() { + if (this.state == 'disabled') return true; + return false; + }, + adminMod() { let tableAdmin = false; let tableMod = false; - let instance = Instances.findOne({ _id: this.instanceid }); + const instance = Instances.findOne({ _id: this.instanceid }); if (Meteor.user()) { const userEmail = Meteor.user().emails[0].address; @@ -283,9 +288,38 @@ Template.list.helpers({ tableMod = true; } } - return tableAdmin || tableMod; }, + hiddenQuestionsPresent() { + let questions; + if (Session.get('search') === 'all') { + questions = Template.instance().visibleQuestions.find({ + instanceid: Template.instance().data._id, + }).fetch(); + } else { + const re = new RegExp(Session.get('search'), 'i'); + questions = Template.instance().visibleQuestions.find({ + instanceid: Template.instance().data._id, + $or: [{ + text: { + $regex: re, + }, + }, { + poster: { + $regex: re, + }, + }], + }).fetch(); + } + let noOfHiddenQues = 0; + questions.forEach(function(question) { + if (question.state === 'disabled') + noOfHiddenQues += 1; + }); + if(noOfHiddenQues > 0) + return true; + return false; + }, hasSeconds() { return Template.instance().seconds.get() > 0 && !Template.instance().state.get('typing'); }, diff --git a/client/views/list/list.scss b/client/views/list/list.scss index 7ab206b9..2749437a 100644 --- a/client/views/list/list.scss +++ b/client/views/list/list.scss @@ -13,6 +13,13 @@ $screen-sm: 768px; font-weight: 700; } +hr{ + border: 0px; + height: 0.3px!important; + color: grey; + margin-bottom: 2%; + background-image: linear-gradient(to right, rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.75), rgba(0, 0, 0, 0)); +} .description { display: block;