Added in admin panel new query for "state" which can be "Idea" or "Pr…

…oyecto".

ext/lib/api/topics/index.js

@@ -49,7 +49,7 @@ app.get('/topics',
       state: {
         type: 'string',
         format: 'states',
-        default: 'pendiente,factible,no-factible,integrado'
+        default: 'idea,proyecto'
       },
       sort: {
         type: 'string',

lib/admin/admin-topics/styles.styl

@@ -42,9 +42,11 @@
   .row-filtros
     margin-top: 10px;
     .input-group
-      margin: 0 auto;
+      // margin: 0 auto;
+      width: 100%;
       select
         display: block;
+        width: 100%;
 
   #topic-list
     .placa

lib/admin/admin-topics/template.jade

@@ -35,21 +35,29 @@
             button.btn.btn-primary.sort.por-nombre(data-sort='topic-title')
               span='A - Z'
       .row.row-filtros
-        .col-md-3.col-xs-12
+        .col-md-6.col-xs-12
           .input-group.input-group-md
             ='Facultad: '
             select(name='facultad')
               option(value="") Todos
               - each obj in uniqAttrs.facultades
                   option(value="#{obj.value}") #{obj.name}
-        .col-md-4.col-xs-12
+        .col-md-6.col-xs-12
           .input-group.input-group-md
             ='Claustro: '
             select(name='claustro')
               option(value="") Todos
               - each obj in uniqAttrs.claustros
                 option(value="#{obj.value}") #{obj.name}
-        .col-md-5.col-xs-12
+      .row.row-filtros
+        .col-md-6.col-xs-12.text-left
+          .input-group.input-group-md
+            ='Tipo: '
+            select(name='state')
+              option(value="") Todos
+              option(value="pendiente") Idea
+              option(value="proyecto") Proyecto
+        .col-md-6.col-xs-12
           .input-group.input-group-md
             ='Temas: '
             select(name='tema')

lib/admin/admin-topics/view.js

@@ -178,8 +178,9 @@ export default class TopicsListView extends View {
     let facultadSelect = this.el[0].querySelector('select[name=facultad]')
     if (facultadSelect.value) query.facultad = facultadSelect.value
 
-    // let temaSelect = this.el[0].querySelector('select[name=tema]')
-    // if (temaSelect.value) query.tema = temaSelect.value
+    let stateSelect = this.el[0].querySelector('select[name=state]')
+    if (stateSelect.value) query.state = stateSelect.value
+
     let temaSelect = this.el[0].querySelector('select[name=tema]')
     if (temaSelect.value) query.tag = temaSelect.value
 
@@ -205,6 +206,9 @@ export default class TopicsListView extends View {
 
     let tag = getQueryVariable('tag')
     if (tag) this.el[0].querySelector('select[name=tema]').value = decodeURIComponent(tag)
+
+    let state = getQueryVariable('state')
+    if (state) this.el[0].querySelector('select[name=state]').value = decodeURIComponent(state)
     // let tema = getQueryVariable('tema')
     // if (tema) this.el[0].querySelector('select[name=tema]').value = decodeURIComponent(tema)
   }

lib/api-v2/db-api/topics/index.js

@@ -107,6 +107,8 @@ exports.list = function list (opts) {
 
       if (opts.tag) query.tag = { $in: [opts.tag] }
 
+      if (opts.state) query["attrs.state"] = opts.state
+
       if (!opts.draft) query.publishedAt = { $ne: null }
 
       if (opts.search) query.mediaTitle  = { $regex : createMediaTitleRegex(opts.search), $options : 'i' }
@@ -149,6 +151,8 @@ exports.listCount = function listCount (opts) {
 
       if (opts.tema) query.tags = { $in: [opts.tema] }
 
+      if (opts.state) query["attrs.state"] = opts.state
+
       if (opts.search) query.mediaTitle  = { $regex : createMediaTitleRegex(opts.search), $options : 'i' }
 
       if (owners && owners.length > 0) query.owner = { $in: owners }

lib/api-v2/topics/index.js

@@ -62,6 +62,10 @@ validate({
     tema: {
       type: 'string',
       format: 'tema'
+    },
+    state: {
+      type: 'string',
+      default: ''
     }
   })
 }),
@@ -75,26 +79,30 @@ function (req, res, next) {
   }
 },
 function getTopics (req, res, next) {
+  let dbQuery = {
+    user: req.user,
+    forum: req.forum,
+    limit: req.query.limit,
+    page: req.query.page,
+    tag: req.query.tag,
+    sort: req.query.sort,
+    draft: !!req.query.draft,
+    search: decodeURI(req.query.search),
+    facultad: req.query.facultad,
+    claustro: req.query.claustro,
+    tema: decodeURI(req.query.tema),
+    state: req.query.state
+  }
+  console.log(dbQuery)
   Promise.all([
-    api.topics.list({
-      user: req.user,
-      forum: req.forum,
-      limit: req.query.limit,
-      page: req.query.page,
-      tag: req.query.tag,
-      sort: req.query.sort,
-      draft: !!req.query.draft,
-      search: decodeURI(req.query.search),
-      facultad: req.query.facultad,
-      claustro: req.query.claustro,
-      tema: decodeURI(req.query.tema)
-    }).then(topics => apiV1.user.populateOwners(topics)),
+    api.topics.list(dbQuery).then(topics => apiV1.user.populateOwners(topics)),
     req.query.limit,
     api.topics.listCount({
       forum: req.forum,
       search: decodeURI(req.query.search),
       facultad: req.query.facultad,
       claustro: req.query.claustro,
+      state: req.query.state,
       tema: decodeURI(req.query.tema)
     })
   ]).then((results) => {

lib/middlewares/topic-middlewares/topic-middlewares.js

@@ -21,7 +21,6 @@ export function findPrivateTopics (ctx, next) {
   if (!ctx.forum) {
     throw new Error('First you must fetch the current forum.')
   }
-
   let query = {
     draft: true,
     forum: ctx.forum.id,
@@ -31,7 +30,8 @@ export function findPrivateTopics (ctx, next) {
     facultad: getQueryVariable('facultad') || '',
     claustro: getQueryVariable('claustro') || '',
     tema: getQueryVariable('tema') || '',
-    tag: getQueryVariable('tag') || ''
+    tag: getQueryVariable('tag') || '',
+    state: getQueryVariable('state') || '',
   }
   topicStore.findAll(query).then(([topics, pagination]) => {
     ctx.topics = topics