Merge branch 'feature/add-resource-validation' into 'master'

Feature/add resource validation

See merge request startinblox/applications/coop-starter/coopstarter-front!20

src/includes/components/widgets.pug

@@ -10,6 +10,18 @@ sib-widget(name='cs-display-property')
   template
     p ${value} 
 
+sib-widget(name='cs-display-link')
+  template
+    p
+      sib-display-link(
+        value="\${value}"
+        label="\${label}"
+      )
+
+sib-widget(name='cs-display-label')
+  template
+    p ${label}
+
 sib-widget(name='cs-display-related-property')
   template
     p ${value.name} 
@@ -27,6 +39,11 @@ sib-widget(name='cs-resource-format-name')
         div
             p ${value.name}
 
+sib-widget(name='cs-resource-status')
+  template
+    div ${value ? ( value == 'to_improve' ? `Improvement required` : `Refused` ) : `Pending validation`}
+
+
 sib-widget(name='cs-action')
   template
     div

src/includes/mentor/resources/detail.pug

@@ -5,20 +5,20 @@ include ../../components/widgets
     bind-resources,
     fields='format, steps, content(name, preview_image, description, tags),\
             submitter_info(submitter.name, \
-            submitter.organisation.name, skills, uri, broken),\
-            reviewer.name, copyright, specifications(\
+            submitter.mentor_profile.organisation.name, skills, uri, broken),\
+            review.reviewer.name, copyright, specifications(\
             header_specifications, author, country, language.name,\
             publication_year, field, type.name, sharing), \
-            related, edit',
+            related_title, related, edit',
 
     widget-submitter.name='cs-display-resource-property',
     widget-edit='sib-action',
-    widget-reviewer.name='cs-display-resource-property',
+    widget-review.reviewer.name='cs-display-resource-property',
     widget-author='cs-display-resource-property',
     widget-country='cs-display-resource-property',
-    widget-submitter.organisation.name='cs-display-resource-property'
+    widget-submitter.mentor_profile.organisation.name='cs-display-resource-property'
     widget-format='cs-display-multiple-property'
-    widget-uri='sib-display-link'
+    widget-uri='cs-display-link'
     widget-skills='cs-display-resource-property'
     widget-description='cs-display-property'
     widget-name='cs-display-property'
@@ -41,8 +41,10 @@ include ../../components/widgets
     each-label-steps="Step"
     multiple-steps
 
+    label-related_title="Related resources"
+    widget-related_title='cs-display-label'
+    label-related=""
     widget-related='cs-display-related-property'
-    label-related="Related resources"
     multiple-related
 
     widget-field='cs-display-multiple-property'
@@ -53,8 +55,8 @@ include ../../components/widgets
     label-skills='With this resource, you will be able to:'
     label-uri='Link to resource'
     label-country='Country:',
-    label-reviewer.name='Resource validated by:',
-    label-submitter.organisation.name='Organisation:',
+    label-review.reviewer.name='Resource validated by:',
+    label-submitter.mentor_profile.organisation.name='Organisation:',
     label-author='Author :',
     label-submitter.name='Resource posted by:',
     label-edit='Edit',

src/includes/mentor/resources/list.pug

@@ -27,27 +27,31 @@ div.block_list
             div#reviews.tabcontent
                 sib-display(
                     data-src=`${endpoints.resources}pending/`
-                    fields='content(name), info(author, publication_year)',
+                    fields='content(name), info(author, publication_year), validate',
                     widget-status='resource-format-name',
-                    next='mentor-resource-validate'
+
+                    action-validate='mentor-resource-validate'
+                    widget-validate='cs-action'
                 )
 
             div(id='requests', class="tabcontent")
                 sib-display(
                     data-src=`${endpoints.requests}`
-                    fields='content(name, description), field, language.name, target',
+                    fields='content(name, description), field, language.name, target, create',
                     widget-format='resource-format-name',
-
-                    next='mentor-resource-create'
+                    
+                    label-create='Create associated resource'
+                    action-create="mentor-resource-create"
+                    widget-create='cs-action'
                 )
 
             div(id='history', class="tabcontent")
                 sib-display(
                     bind-user
                     nested-field='resources'
-                    fields='content(name), reviews.status, info(format, publication_year), edit',
-                    widget-reviews.status='resource-format-name',
-
+                    fields='content(name), review.status, info(format, publication_year), edit, detail',
+                    widget-review.status='cs-resource-status',
+                    
                     widget-format='cs-display-multiple-property'
                     label-format='Formats: '
                     each-label-format=''
@@ -55,5 +59,7 @@ div.block_list
 
                     widget-edit='cs-action'
                     action-edit='mentor-resource-edit'
-                    next='mentor-resource-detail'
-                    )
\ No newline at end of file
+
+                    widget-detail='cs-action'
+                    action-detail='mentor-resource-detail'
+                )

src/includes/mentor/resources/validate.pug

 include ../../components/widgets
 
+sib-router
+  sib-route(name='improvement-dialog')
+  sib-route(name='refusal-dialog')
+
 .block_log.block_creat_count
   sib-display(
     bind-resources,
     fields='format, steps, content(name, preview_image, description, tags),\
             submitter_info(submitter.name, \
-            submitter.organisation.name, skills, uri, broken),\
-            reviewer.name, copyright, specifications(\
+            submitter.mentor_profile.organisation.name, skills, uri, broken), copyright, specifications(\
             header_specifications, author, country, language.name,\
             publication_year, field, type.name, sharing), \
-            related',
+            related, improve, refuse',
 
     widget-submitter.name='cs-display-resource-property',
-    widget-reviewer.name='cs-display-resource-property',
     widget-author='cs-display-resource-property',
     widget-country='cs-display-resource-property',
-    widget-submitter.organisation.name='cs-display-resource-property'
+    widget-submitter.mentor_profile.organisation.name='cs-display-resource-property'
     widget-format='cs-display-multiple-property'
-    widget-uri='sib-display-link'
+    widget-uri='cs-display-link'
     widget-skills='cs-display-resource-property'
     widget-description='cs-display-property'
     widget-name='cs-display-property'
@@ -40,8 +42,10 @@ include ../../components/widgets
     each-label-steps="Step"
     multiple-steps
 
+    label-related_title="Related resources"
+    widget-related_title='cs-display-label'
+    label-related=''
     widget-related='cs-display-related-property'
-    label-related="Related resources"
     multiple-related
 
     widget-field='cs-display-multiple-property'
@@ -52,10 +56,19 @@ include ../../components/widgets
     label-skills='With this resource, you will be able to:'
     label-uri='Link to resource'
     label-country='Country:',
-    label-reviewer.name='Resource validated by:',
-    label-submitter.organisation.name='Organisation:',
+    label-submitter.mentor_profile.organisation.name='Organisation:',
     label-author='Author :',
     label-submitter.name='Resource posted by:',
+
+    widget-improve='sib-action'
+    label-improve='Require improvement'
+    action-improve='improvement-dialog'
+    class-improve='button_base'
+
+    widget-refuse='sib-action'
+    label-refuse='Report as inappropriate'
+    action-refuse='refusal-dialog'
+    class-refuse='button_base'
   )
 
   sib-form(
@@ -64,17 +77,21 @@ include ../../components/widgets
     data-src=`${endpoints.reviews}`
     submit-button='Validate'
   )
-  
-  sib-form(
-    bind-resources,
-    fields='',
-    data-src=`${endpoints.reviews}`
-    submit-button='Report as inappropriate'
-  )
 
-  sib-form(
-    bind-resources,
-    fields='',
-    data-src=`${endpoints.reviews}`
-    submit-button='Require improvement'
-  )
\ No newline at end of file
+  dialog#refusal-dialog
+    h2 Report as inappropriate
+    sib-form(
+      bind-resources,
+      fields='',
+      data-src=`${endpoints.reviews}`
+      submit-button='Report as inappropriate'
+    )
+
+  dialog#improvement-dialog
+    h2 Require improvement
+    sib-form(
+      bind-resources,
+      fields='',
+      data-src=`${endpoints.reviews}`
+      submit-button='Require improvement'
+    )
\ No newline at end of file