adding scientific program CRUD pages

ALEXIS-PC\alexis
1 parent 6df730cd
Showing 15 changed files with 155 additions and 2 deletions Show diff stats
src/core/pyros_django/dashboard/templates/dashboard/proposal.html
src/core/pyros_django/pyros/settings.py
src/core/pyros_django/pyros/urls.py
src/core/pyros_django/scientific_program/__init__.py
src/core/pyros_django/scientific_program/admin.py
src/core/pyros_django/scientific_program/apps.py
src/core/pyros_django/scientific_program/forms.py
src/core/pyros_django/scientific_program/migrations/__init__.py
src/core/pyros_django/scientific_program/models.py
src/core/pyros_django/scientific_program/templates/scientific_program/create_scientific_program.html
src/core/pyros_django/scientific_program/templates/scientific_program/scientific_program_detail.html
src/core/pyros_django/scientific_program/templates/scientific_program/scientific_program_detail_edit.html
src/core/pyros_django/scientific_program/tests.py
src/core/pyros_django/scientific_program/urls.py
src/core/pyros_django/scientific_program/views.py
@@ -29,6 +29,9 @@
     <div class="row">
         <h3>List of proposal Info - <span class="label label-primary">{{proposal_info|length}}</span></h3>
         <div class="table-responsive">
+        {% if USER_LEVEL >= USER_LEVEL_PI %}
+            <a href="{% url "create_scientific_program" %}" class="btn btn-info" role="button">Create new scientific_program</a>
+        {% endif %}
             <table
                 class="table table-bordered table-hover table-striped tablesorter" style="font-family: 'Montserra', sans-serif;">
                 <thead>
@@ -43,8 +46,16 @@
                 <tbody>
                     {% for proposal_inf in proposal_info %}
                         <tr>
-                                <td>{{ proposal_inf.pyros_users }}</td>
-                                <td>{{ proposal_inf.name }}</td>
+                                <td>
+                                    {% for user in proposal_inf.pyros_users.all|slice:":3" %}
+                                        {{ user.username }} 
+                                    {% endfor %}
+                                    {% if proposal_inf.pyros_users.all.count > 3 %}
+                                    ...
+                                    {% endif %}
+                                </td>
+                                
+                                <td><a href="{% url 'detail_scientific_program' proposal_inf.id %}">{{ proposal_inf.name }}</a></td>
                                 <td>{{ proposal_inf.desc }}</td>
                                 <td>{{ proposal_inf.quota }}</td>
                                 <td>{{ proposal_inf.priority }}</td>
@@ -162,6 +162,7 @@ INSTALLED_APPS = [
     'routine_manager',
     'user_manager',
     'devices',
+    'scientific_program',
     #'kombu.transport.django'
 ]
  
@@ -40,6 +40,7 @@ urlpatterns = [
     url(r'^observation_manager/', include('observation_manager.urls')),
     url(r'^routine_manager/', include('routine_manager.urls')),
     url(r'^user_manager/', include('user_manager.urls')),
+    url(r'^scientific_program/', include('scientific_program.urls')),
     url(r'^$', user_manager.views.home)
 ] + static(settings.STATIC_URL, document_root=settings.STATIC_ROOT)
  
@@ -0,0 +1,3 @@
+from django.contrib import admin
+
+# Register your models here.
@@ -0,0 +1,5 @@
+from django.apps import AppConfig
+
+
+class ScientificProgramConfig(AppConfig):
+    name = 'scientific_program'
@@ -0,0 +1,21 @@
+from django import forms
+from common.models import ScientificProgram,PyrosUser
+
+class ScientificProgramForm(forms.ModelForm):
+    
+    class Meta:
+        model = ScientificProgram
+        fields = (
+            "name",
+            "desc",
+            "quota",
+            "priority",
+            "pyros_users",
+        )
+
+            
+        widgets = {
+            
+            "pyros_users": forms.CheckboxSelectMultiple()
+        }
+
@@ -0,0 +1,3 @@
+from django.db import models
+
+# Create your models here.
@@ -0,0 +1,12 @@
+{% extends 'base.html' %}
+
+{% block content %}
+
+<form id="createSPForm" action="" method="post">
+    {% csrf_token %}
+    {{ form.as_p }}
+    <input id="submit" class="btn btn-info" type="submit" value="Submit" />
+    <a href="{% url "proposal" %}" class="btn btn-info" role="button">Cancel</a>
+</form>
+
+{% endblock %}
 \ No newline at end of file
@@ -0,0 +1,29 @@
+{% extends 'base.html' %}
+
+{% block content %}
+    <a href="{% url "proposal" %}" class="btn btn-info" role="button">Return to list of scientific program</a>
+
+    <p><strong>Name : </strong>{{ scientific_program.name }}</p>
+    <p><strong>Quota : </strong>{{ scientific_program.quota }}</p>
+    <p><strong>Priority: </strong>{{ scientific_program.priority }}</p>
+    <table class="table table-bordered table-hover table-striped tablesorter" style="font-family: 'Montserra', sans-serif;">
+        <thead>
+            <tr>
+                <th>Users <i class="fa fa-sort"></i></th>
+            </tr>
+        </thead>
+    <tbody>
+    {% for user in scientific_program.pyros_users.all  %}
+        <tr><td>{{ user.username }}</td></tr>    
+    {% endfor %}
+    </tbody>
+    </table></p>
+    {% if USER_LEVEL >= USER_LEVEL_PI %}
+        <a href="{% url "edit_scientific_program" scientific_program.id %}" class="btn btn-info" role="button">Edit</a>
+    {% endif %}
+    {% if USER_LEVEL >= USER_LEVEL_PI %}
+        <a href="{% url "delete_scientific_program" scientific_program.id %}" class="btn btn-danger" role="button">Delete</a>
+    {% endif %}
+</form>
+
+{% endblock %}
 \ No newline at end of file
@@ -0,0 +1,12 @@
+{% extends 'base.html' %}
+
+{% block content %}
+
+<form id="editSPForm" action="" method="post">
+    {% csrf_token %}
+    {{ form.as_p }}
+    <input id="submit" class="btn btn-info" type="submit" value="Submit" />
+    <a href="{% url "detail_scientific_program" id %}" class="btn btn-info" role="button">Cancel</a>
+</form>
+
+{% endblock %}
 \ No newline at end of file
@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.
@@ -0,0 +1,10 @@
+from django.conf.urls import url
+from django.urls import path
+from . import views
+
+urlpatterns = [
+    path('create_scientific_program', views.create_sp,name='create_scientific_program'),
+    path('edit_scientific_program/<int:id>/', views.edit_sp,name='edit_scientific_program'),
+    path('detail_scientific_program/<int:id>/', views.detail_sp,name='detail_scientific_program'),
+    path('delete_scientific_program/<int:id>/', views.delete_sp,name='delete_scientific_program'),
+]
@@ -0,0 +1,42 @@
+from django.shortcuts import render,redirect,get_object_or_404,reverse
+from django.contrib.auth import authenticate
+from django.contrib.auth.decorators import login_required
+from .forms import ScientificProgramForm
+from src.core.pyros_django.dashboard.decorator import level_required
+from common.models import ScientificProgram
+from django.http import HttpResponseRedirect
+
+
+@level_required(6)
+@login_required
+def create_sp(request):
+    form = ScientificProgramForm(request.POST)
+    if request.POST:
+        if form.is_valid():
+            form.save()
+            return HttpResponseRedirect(reverse("proposal"))
+    form = ScientificProgramForm()
+    return render(request,"scientific_program/create_scientific_program.html",{"form": form})
+
+@level_required(6)
+@login_required
+def edit_sp(request,id):
+    edit = get_object_or_404(ScientificProgram, pk=id)
+    form = ScientificProgramForm(request.POST or None, instance=edit)
+    if form.is_valid():
+        form.save()
+        return redirect('detail_scientific_program', id=id)
+    return render(request, 'scientific_program/scientific_program_detail_edit.html', {'id' : id, 'form': form})
+
+
+@login_required
+def detail_sp(request,id):
+    scientific_program = get_object_or_404(ScientificProgram, pk=id)
+    return render(request, 'scientific_program/scientific_program_detail.html', {'scientific_program': scientific_program})
+
+@level_required(6)
+@login_required()
+def delete_sp(request,id):
+    scientific_program = get_object_or_404(ScientificProgram, pk=int(id))
+    scientific_program.delete()
+    return HttpResponseRedirect(reverse('proposal'))
 \ No newline at end of file