Merge pull request #831 from rdmorganiser/order_tasks_views

Order tasks/issues an views in projects

rdmo/management/assets/js/components/edit/EditTask.js

@@ -76,14 +76,18 @@ const EditTask = ({ config, task, elements, elementActions}) => {
                   rows={4} onChange={updateTask} />
 
         <div className="row">
-          <div className="col-sm-6">
+          <div className="col-sm-4">
             <Checkbox config={config} element={task} field="locked"
                       onChange={updateTask} />
           </div>
-          <div className="col-sm-6">
+          <div className="col-sm-4">
             <Checkbox config={config} element={task} field="available"
                       onChange={updateTask} />
           </div>
+          <div className="col-sm-4">
+            <Number config={config} element={task} field="order"
+                    onChange={updateTask} />
+          </div>
         </div>
 
         <Tabs id="#task-tabs" defaultActiveKey={0} animation={false}>

rdmo/management/assets/js/components/edit/EditView.js

@@ -5,6 +5,7 @@ import get from 'lodash/get'
 
 import CodeMirror from './common/CodeMirror'
 import Checkbox from './common/Checkbox'
+import Number from './common/Number'
 import Select from './common/Select'
 import Text from './common/Text'
 import Textarea from './common/Textarea'
@@ -70,14 +71,18 @@ const EditView = ({ config, view, elements, elementActions }) => {
                   rows={4} onChange={updateView} />
 
         <div className="row">
-          <div className="col-sm-6">
+          <div className="col-sm-4">
             <Checkbox config={config} element={view} field="locked"
                       onChange={updateView} />
           </div>
-          <div className="col-sm-6">
+          <div className="col-sm-4">
             <Checkbox config={config} element={view} field="available"
                       onChange={updateView} />
           </div>
+          <div className="col-sm-4">
+            <Number config={config} element={view} field="order"
+                    onChange={updateView} />
+          </div>
         </div>
 
         <Tabs id="#view-tabs" defaultActiveKey={0} animation={false}>

rdmo/management/assets/js/components/element/Task.js

@@ -1,5 +1,6 @@
 import React from 'react'
 import PropTypes from 'prop-types'
+import get from 'lodash/get'
 
 import { filterElement } from '../../utils/filter'
 import { buildPath } from '../../utils/location'
@@ -21,6 +22,8 @@ const Task = ({ config, task, elementActions, filter=false, filterSites=false, f
   const toggleAvailable = () => elementActions.storeElement('tasks', {...task, available: !task.available })
   const toggleLocked = () => elementActions.storeElement('tasks', {...task, locked: !task.locked })
 
+  const fetchCondition = (index) => elementActions.fetchElement('conditions', task.conditions[index])
+
   return showElement && (
     <li className="list-group-item">
       <div className="element">
@@ -40,8 +43,20 @@ const Task = ({ config, task, elementActions, filter=false, filterSites=false, f
         <div>
           <p>
             <strong>{gettext('Task')}{': '}</strong>
-            <CodeLink className="code-tasks" uri={task.uri} onClick={() => fetchEdit()} />
+            {task.title}
           </p>
+          {
+            get(config, 'display.uri.tasks', true) && <p>
+              <CodeLink className="code-tasks" uri={task.uri} onClick={() => fetchEdit()} />
+            </p>
+          }
+          {
+            get(config, 'display.uri.conditions', true) && task.condition_uris.map((uri, index) => (
+              <p key={index}>
+                <CodeLink className="code-conditions" uri={uri} onClick={() => fetchCondition(index)} />
+              </p>
+            ))
+          }
           <ElementErrors element={task} />
         </div>
       </div>

rdmo/management/assets/js/components/elements/Tasks.js

@@ -6,6 +6,7 @@ import { getUriPrefixes } from '../../utils/filter'
 
 import { FilterString, FilterUriPrefix, FilterSite} from '../common/Filter'
 import { BackButton, NewButton } from '../common/Buttons'
+import { Checkbox } from '../common/Checkboxes'
 
 import Task from '../element/Task'
 
@@ -16,6 +17,9 @@ const Tasks = ({ config, tasks, configActions, elementActions }) => {
   const updateFilterSite = (value) => configActions.updateConfig('filter.sites', value)
   const updateFilterEditor = (value) => configActions.updateConfig('filter.editors', value)
 
+  const updateDisplayTasksURI = (value) => configActions.updateConfig('display.uri.tasks', value)
+  const updateDisplayConditionsURI = (value) => configActions.updateConfig('display.uri.conditions', value)
+
   const createTask = () => elementActions.createElement('tasks')
 
   return (
@@ -51,6 +55,14 @@ const Tasks = ({ config, tasks, configActions, elementActions }) => {
             </>
           }
         </div>
+        <div className="checkboxes">
+          <span className="mr-10">{gettext('Show URIs:')}</span>
+          <Checkbox label={<code className="code-tasks">{gettext('Tasks')}</code>}
+                    value={get(config, 'display.uri.tasks', true)} onChange={updateDisplayTasksURI} />
+          <Checkbox label={<code className="code-conditions">{gettext('Conditions')}</code>}
+                    value={get(config, 'display.uri.conditions', true)} onChange={updateDisplayConditionsURI} />
+        </div>
+
       </div>
 
       <ul className="list-group">

rdmo/projects/migrations/0060_alter_issue_options.py

@@ -0,0 +1,17 @@
+# Generated by Django 4.2.6 on 2023-11-18 10:23
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('projects', '0059_project_progress'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='issue',
+            options={'ordering': ('project__title', 'task__uri'), 'verbose_name': 'Issue', 'verbose_name_plural': 'Issues'},
+        ),
+    ]

rdmo/projects/models/issue.py

@@ -40,7 +40,7 @@ class Issue(models.Model):
     )
 
     class Meta:
-        ordering = ('project__title', )
+        ordering = ('project__title', 'task__uri')
         verbose_name = _('Issue')
         verbose_name_plural = _('Issues')
 

rdmo/projects/templates/projects/project_detail_views.html

@@ -12,7 +12,7 @@ <h2>{% trans 'Views' %}</h2>
 
     {% include 'projects/project_detail_views_help.html' %}
 
-    {% if project.views.exists %}
+    {% if views %}
 
         <table class="table">
             <thead>
@@ -27,7 +27,7 @@ <h2>{% trans 'Views' %}</h2>
                 </th>
             </thead>
             <tbody>
-                {% for view in project.views.all %}
+                {% for view in views %}
                 <tr>
                     <td>
                         <a href="{% url 'project_view' project.pk view.pk %}">{{ view.title }}</a>

rdmo/projects/views/project.py

@@ -158,7 +158,10 @@ def get_context_data(self, **kwargs):
         context['memberships'] = memberships.order_by('user__last_name', '-project__level')
         context['integrations'] = integrations.order_by('provider_key', '-project__level')
         context['providers'] = get_plugins('PROJECT_ISSUE_PROVIDERS')
-        context['issues'] = [issue for issue in project.issues.all() if issue.resolve(values)]
+        context['issues'] = [
+            issue for issue in project.issues.order_by('-status', 'task__order', 'task__uri') if issue.resolve(values)
+        ]
+        context['views'] = project.views.order_by('order', 'uri')
         context['snapshots'] = project.snapshots.all()
         context['invites'] = project.invites.all()
         context['membership'] = Membership.objects.filter(project=project, user=self.request.user).first()

rdmo/tasks/imports.py

@@ -25,6 +25,8 @@ def import_task(element, save=False, user=None):
 
     set_common_fields(task, element)
 
+    task.order = element.get('order') or 0
+
     set_lang_field(task, 'title', element)
     set_lang_field(task, 'text', element)
 

rdmo/tasks/migrations/0036_task_order.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.2.6 on 2023-11-18 10:23
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('tasks', '0035_uri_path'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='task',
+            name='order',
+            field=models.IntegerField(default=0, help_text='The position of this task in lists.', verbose_name='Order'),
+        ),
+    ]

rdmo/tasks/models.py

@@ -42,6 +42,11 @@ class Task(TranslationMixin, models.Model):
         verbose_name=_('Locked'),
         help_text=_('Designates whether this task can be changed.')
     )
+    order = models.IntegerField(
+        default=0,
+        verbose_name=_('Order'),
+        help_text=_('The position of this task in lists.')
+    )
     catalogs = models.ManyToManyField(
         Catalog, blank=True,
         verbose_name=_('Catalogs'),

rdmo/tasks/renderers/mixins.py

@@ -11,6 +11,7 @@ def render_task(self, xml, task):
             self.render_text_element(xml, 'uri_prefix', {}, task['uri_prefix'])
             self.render_text_element(xml, 'uri_path', {}, task['uri_path'])
             self.render_text_element(xml, 'dc:comment', {}, task['comment'])
+            self.render_text_element(xml, 'order', {}, task['order'])
 
             for lang_code, lang_string, lang_field in get_languages():
                 self.render_text_element(xml, 'title', {'lang': lang_code}, task['title_%s' % lang_code])

rdmo/tasks/serializers/export.py

@@ -20,6 +20,7 @@ class Meta:
             'uri_prefix',
             'uri_path',
             'comment',
+            'order',
             'start_attribute',
             'end_attribute',
             'days_before',

rdmo/tasks/serializers/v1.py

@@ -21,6 +21,8 @@ class TaskSerializer(TranslationSerializerMixin, ElementModelSerializerMixin,
     warning = serializers.SerializerMethodField()
     read_only = serializers.SerializerMethodField()
 
+    condition_uris = serializers.SerializerMethodField()
+
     projects_count = serializers.IntegerField(read_only=True)
 
     class Meta:
@@ -33,6 +35,7 @@ class Meta:
             'uri_path',
             'comment',
             'locked',
+            'order',
             'available',
             'catalogs',
             'sites',
@@ -47,6 +50,7 @@ class Meta:
             'text',
             'warning',
             'read_only',
+            'condition_uris',
             'projects_count',
         )
         trans_fields = (
@@ -61,6 +65,9 @@ class Meta:
             'title',
         )
 
+    def get_condition_uris(self, obj):
+        return [condition.uri for condition in obj.conditions.all()]
+
 
 class TaskIndexSerializer(serializers.ModelSerializer):
 

rdmo/views/imports.py

@@ -18,6 +18,7 @@ def import_view(element, save=False, user=None):
 
     set_common_fields(view, element)
 
+    view.order = element.get('order') or 0
     view.template = element.get('template')
 
     set_lang_field(view, 'title', element)

rdmo/views/migrations/0029_view_order.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.2.6 on 2023-11-18 10:23
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('views', '0028_uri_path'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='view',
+            name='order',
+            field=models.IntegerField(default=0, help_text='The position of this view in lists.', verbose_name='Order'),
+        ),
+    ]

rdmo/views/models.py

@@ -43,6 +43,11 @@ class View(models.Model, TranslationMixin):
         verbose_name=_('Locked'),
         help_text=_('Designates whether this view can be changed.')
     )
+    order = models.IntegerField(
+        default=0,
+        verbose_name=_('Order'),
+        help_text=_('The position of this view in lists.')
+    )
     catalogs = models.ManyToManyField(
         Catalog, blank=True,
         verbose_name=_('Catalogs'),

rdmo/views/renderers/mixins.py

@@ -11,6 +11,7 @@ def render_view(self, xml, view):
             self.render_text_element(xml, 'uri_prefix', {}, view['uri_prefix'])
             self.render_text_element(xml, 'uri_path', {}, view['uri_path'])
             self.render_text_element(xml, 'dc:comment', {}, view['comment'])
+            self.render_text_element(xml, 'order', {}, view['order'])
 
             for lang_code, lang_string, lang_field in get_languages():
                 self.render_text_element(xml, 'title', {'lang': lang_code}, view['title_%s' % lang_code])

rdmo/views/serializers/export.py

@@ -16,6 +16,7 @@ class Meta:
             'uri_prefix',
             'uri_path',
             'comment',
+            'order',
             'catalogs',
             'template'
         )

rdmo/views/serializers/v1.py

@@ -46,6 +46,7 @@ class Meta:
             'uri_path',
             'comment',
             'locked',
+            'order',
             'available',
             'catalogs',
             'sites',