You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sm...@apache.org on 2017/12/14 01:51:25 UTC
[airavata-sandbox] 03/08: updated Request Model,
Added forms for Create Request
This is an automated email from the ASF dual-hosted git repository.
smarru pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/airavata-sandbox.git
commit b8ffad7758dc3077a888b5b414f71921e446a561
Author: Prasandeep Singh <pr...@gmail.com>
AuthorDate: Fri Dec 1 03:23:24 2017 -0500
updated Request Model, Added forms for Create Request
---
.../dashboard/migrations/0001_initial.py | 25 ++--
.../dashboard/migrations/0001_initial.pyc | Bin 1517 -> 1370 bytes
.../migrations/0002_auto_20171201_0656.py | 94 ++++++++++++
.../migrations/0002_auto_20171201_0656.pyc | Bin 0 -> 2128 bytes
.../migrations/0003_auto_20171128_0601.pyc | Bin 993 -> 0 bytes
.../migrations/0003_auto_20171201_0705.py | 21 +++
.../migrations/0003_auto_20171201_0705.pyc | Bin 0 -> 1081 bytes
.../migrations/0004_auto_20171201_0047.py | 38 -----
.../migrations/0004_auto_20171201_0047.pyc | Bin 1614 -> 0 bytes
...20171128_0601.py => 0004_auto_20171201_0707.py} | 10 +-
.../migrations/0004_auto_20171201_0707.pyc | Bin 0 -> 1018 bytes
.../migrations/0005_remove_request_request_date.py | 19 +++
.../0005_remove_request_request_date.pyc | Bin 0 -> 928 bytes
.../migrations/0006_request_request_date.py | 20 +++
.../migrations/0006_request_request_date.pyc | Bin 0 -> 1038 bytes
.../ResourceAllocationManager/dashboard/models.py | 19 ++-
.../ResourceAllocationManager/dashboard/models.pyc | Bin 1626 -> 2052 bytes
.../dashboard/templates/dashboard/detail.html | 2 +-
.../templates/dashboard/request_form.html | 164 ++++++++++++++++++++-
.../ResourceAllocationManager/dashboard/views.py | 11 +-
.../ResourceAllocationManager/dashboard/views.pyc | Bin 4141 -> 4554 bytes
.../django/ResourceAllocationManager/db.sqlite3 | Bin 52224 -> 52224 bytes
22 files changed, 351 insertions(+), 72 deletions(-)
diff --git a/allocation-manager/django/ResourceAllocationManager/dashboard/migrations/0001_initial.py b/allocation-manager/django/ResourceAllocationManager/dashboard/migrations/0001_initial.py
index b5a6800..7028b4e 100644
--- a/allocation-manager/django/ResourceAllocationManager/dashboard/migrations/0001_initial.py
+++ b/allocation-manager/django/ResourceAllocationManager/dashboard/migrations/0001_initial.py
@@ -1,9 +1,8 @@
# -*- coding: utf-8 -*-
-# Generated by Django 1.10 on 2017-11-20 23:04
+# Generated by Django 1.10 on 2017-12-01 04:20
from __future__ import unicode_literals
from django.db import migrations, models
-import django.db.models.deletion
class Migration(migrations.Migration):
@@ -15,22 +14,16 @@ class Migration(migrations.Migration):
operations = [
migrations.CreateModel(
- name='Album',
+ name='Request',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
- ('artist', models.CharField(max_length=250)),
- ('album_title', models.CharField(max_length=500)),
- ('genre', models.CharField(max_length=100)),
- ('album_logo', models.CharField(max_length=1000)),
- ],
- ),
- migrations.CreateModel(
- name='Song',
- fields=[
- ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
- ('file_type', models.CharField(max_length=10)),
- ('song_title', models.CharField(max_length=250)),
- ('album', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='dashboard.Album')),
+ ('request_title', models.CharField(max_length=250)),
+ ('request_description', models.CharField(max_length=500)),
+ ('request_status', models.CharField(max_length=20)),
+ ('request_comments', models.FileField(upload_to=b'')),
+ ('allocation_type', models.CharField(max_length=100)),
+ ('cpu_hours_requested', models.CharField(max_length=10)),
+ ('cpu_hours_allocated', models.CharField(max_length=10)),
],
),
]
diff --git a/allocation-manager/django/ResourceAllocationManager/dashboard/migrations/0001_initial.pyc b/allocation-manager/django/ResourceAllocationManager/dashboard/migrations/0001_initial.pyc
index ab7ebfd..78ac32d 100644
Binary files a/allocation-manager/django/ResourceAllocationManager/dashboard/migrations/0001_initial.pyc and b/allocation-manager/django/ResourceAllocationManager/dashboard/migrations/0001_initial.pyc differ
diff --git a/allocation-manager/django/ResourceAllocationManager/dashboard/migrations/0002_auto_20171201_0656.py b/allocation-manager/django/ResourceAllocationManager/dashboard/migrations/0002_auto_20171201_0656.py
new file mode 100644
index 0000000..f953860
--- /dev/null
+++ b/allocation-manager/django/ResourceAllocationManager/dashboard/migrations/0002_auto_20171201_0656.py
@@ -0,0 +1,94 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10 on 2017-12-01 06:56
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('dashboard', '0001_initial'),
+ ]
+
+ operations = [
+ migrations.RenameField(
+ model_name='request',
+ old_name='request_comments',
+ new_name='document',
+ ),
+ migrations.RemoveField(
+ model_name='request',
+ name='cpu_hours_allocated',
+ ),
+ migrations.RemoveField(
+ model_name='request',
+ name='cpu_hours_requested',
+ ),
+ migrations.AddField(
+ model_name='request',
+ name='applications_to_be_used',
+ field=models.CharField(default='', max_length=100),
+ preserve_default=False,
+ ),
+ migrations.AddField(
+ model_name='request',
+ name='disk_usage_range_per_job',
+ field=models.BigIntegerField(default=0),
+ preserve_default=False,
+ ),
+ migrations.AddField(
+ model_name='request',
+ name='field_of_science',
+ field=models.CharField(default='', max_length=50),
+ preserve_default=False,
+ ),
+ migrations.AddField(
+ model_name='request',
+ name='keywords',
+ field=models.CharField(default='', max_length=100),
+ preserve_default=False,
+ ),
+ migrations.AddField(
+ model_name='request',
+ name='max_memory_per_cpu',
+ field=models.BigIntegerField(default=0),
+ preserve_default=False,
+ ),
+ migrations.AddField(
+ model_name='request',
+ name='num_cpus_per_job',
+ field=models.BigIntegerField(default=0),
+ preserve_default=False,
+ ),
+ migrations.AddField(
+ model_name='request',
+ name='request_date',
+ field=models.DateField(default=''),
+ preserve_default=False,
+ ),
+ migrations.AddField(
+ model_name='request',
+ name='request_reviewed_and_funded_by',
+ field=models.CharField(default='', max_length=100),
+ preserve_default=False,
+ ),
+ migrations.AddField(
+ model_name='request',
+ name='service_units',
+ field=models.BigIntegerField(default=0),
+ preserve_default=False,
+ ),
+ migrations.AddField(
+ model_name='request',
+ name='specific_resource_selection',
+ field=models.CharField(default='', max_length=100),
+ preserve_default=False,
+ ),
+ migrations.AddField(
+ model_name='request',
+ name='typical_su_per_job',
+ field=models.BigIntegerField(default=0),
+ preserve_default=False,
+ ),
+ ]
diff --git a/allocation-manager/django/ResourceAllocationManager/dashboard/migrations/0002_auto_20171201_0656.pyc b/allocation-manager/django/ResourceAllocationManager/dashboard/migrations/0002_auto_20171201_0656.pyc
new file mode 100644
index 0000000..a08da3e
Binary files /dev/null and b/allocation-manager/django/ResourceAllocationManager/dashboard/migrations/0002_auto_20171201_0656.pyc differ
diff --git a/allocation-manager/django/ResourceAllocationManager/dashboard/migrations/0003_auto_20171128_0601.pyc b/allocation-manager/django/ResourceAllocationManager/dashboard/migrations/0003_auto_20171128_0601.pyc
deleted file mode 100644
index 6f2e3d8..0000000
Binary files a/allocation-manager/django/ResourceAllocationManager/dashboard/migrations/0003_auto_20171128_0601.pyc and /dev/null differ
diff --git a/allocation-manager/django/ResourceAllocationManager/dashboard/migrations/0003_auto_20171201_0705.py b/allocation-manager/django/ResourceAllocationManager/dashboard/migrations/0003_auto_20171201_0705.py
new file mode 100644
index 0000000..524ab12
--- /dev/null
+++ b/allocation-manager/django/ResourceAllocationManager/dashboard/migrations/0003_auto_20171201_0705.py
@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10 on 2017-12-01 07:05
+from __future__ import unicode_literals
+
+import datetime
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('dashboard', '0002_auto_20171201_0656'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='request',
+ name='request_date',
+ field=models.DateField(default=datetime.date.today, verbose_name='Date'),
+ ),
+ ]
diff --git a/allocation-manager/django/ResourceAllocationManager/dashboard/migrations/0003_auto_20171201_0705.pyc b/allocation-manager/django/ResourceAllocationManager/dashboard/migrations/0003_auto_20171201_0705.pyc
new file mode 100644
index 0000000..b5b68c4
Binary files /dev/null and b/allocation-manager/django/ResourceAllocationManager/dashboard/migrations/0003_auto_20171201_0705.pyc differ
diff --git a/allocation-manager/django/ResourceAllocationManager/dashboard/migrations/0004_auto_20171201_0047.py b/allocation-manager/django/ResourceAllocationManager/dashboard/migrations/0004_auto_20171201_0047.py
deleted file mode 100644
index df2fa83..0000000
--- a/allocation-manager/django/ResourceAllocationManager/dashboard/migrations/0004_auto_20171201_0047.py
+++ /dev/null
@@ -1,38 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.10 on 2017-12-01 00:47
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('dashboard', '0003_auto_20171128_0601'),
- ]
-
- operations = [
- migrations.CreateModel(
- name='Request',
- fields=[
- ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
- ('request_title', models.CharField(max_length=250)),
- ('request_description', models.CharField(max_length=500)),
- ('request_status', models.CharField(max_length=20)),
- ('request_comments', models.FileField(upload_to=b'')),
- ('allocation_type', models.CharField(max_length=100)),
- ('cpu_hours_requested', models.CharField(max_length=10)),
- ('cpu_hours_allocated', models.CharField(max_length=10)),
- ],
- ),
- migrations.RemoveField(
- model_name='song',
- name='album',
- ),
- migrations.DeleteModel(
- name='Album',
- ),
- migrations.DeleteModel(
- name='Song',
- ),
- ]
diff --git a/allocation-manager/django/ResourceAllocationManager/dashboard/migrations/0004_auto_20171201_0047.pyc b/allocation-manager/django/ResourceAllocationManager/dashboard/migrations/0004_auto_20171201_0047.pyc
deleted file mode 100644
index 27abfa6..0000000
Binary files a/allocation-manager/django/ResourceAllocationManager/dashboard/migrations/0004_auto_20171201_0047.pyc and /dev/null differ
diff --git a/allocation-manager/django/ResourceAllocationManager/dashboard/migrations/0003_auto_20171128_0601.py b/allocation-manager/django/ResourceAllocationManager/dashboard/migrations/0004_auto_20171201_0707.py
similarity index 51%
rename from allocation-manager/django/ResourceAllocationManager/dashboard/migrations/0003_auto_20171128_0601.py
rename to allocation-manager/django/ResourceAllocationManager/dashboard/migrations/0004_auto_20171201_0707.py
index 9214cda..e82bf3c 100644
--- a/allocation-manager/django/ResourceAllocationManager/dashboard/migrations/0003_auto_20171128_0601.py
+++ b/allocation-manager/django/ResourceAllocationManager/dashboard/migrations/0004_auto_20171201_0707.py
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
-# Generated by Django 1.10 on 2017-11-28 06:01
+# Generated by Django 1.10 on 2017-12-01 07:07
from __future__ import unicode_literals
from django.db import migrations, models
@@ -8,13 +8,13 @@ from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
- ('dashboard', '0002_song_is_favourite'),
+ ('dashboard', '0003_auto_20171201_0705'),
]
operations = [
migrations.AlterField(
- model_name='album',
- name='album_logo',
- field=models.FileField(upload_to=b''),
+ model_name='request',
+ name='request_date',
+ field=models.DateTimeField(blank=True, null=True),
),
]
diff --git a/allocation-manager/django/ResourceAllocationManager/dashboard/migrations/0004_auto_20171201_0707.pyc b/allocation-manager/django/ResourceAllocationManager/dashboard/migrations/0004_auto_20171201_0707.pyc
new file mode 100644
index 0000000..f3290b3
Binary files /dev/null and b/allocation-manager/django/ResourceAllocationManager/dashboard/migrations/0004_auto_20171201_0707.pyc differ
diff --git a/allocation-manager/django/ResourceAllocationManager/dashboard/migrations/0005_remove_request_request_date.py b/allocation-manager/django/ResourceAllocationManager/dashboard/migrations/0005_remove_request_request_date.py
new file mode 100644
index 0000000..5c73fe7
--- /dev/null
+++ b/allocation-manager/django/ResourceAllocationManager/dashboard/migrations/0005_remove_request_request_date.py
@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10 on 2017-12-01 07:08
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('dashboard', '0004_auto_20171201_0707'),
+ ]
+
+ operations = [
+ migrations.RemoveField(
+ model_name='request',
+ name='request_date',
+ ),
+ ]
diff --git a/allocation-manager/django/ResourceAllocationManager/dashboard/migrations/0005_remove_request_request_date.pyc b/allocation-manager/django/ResourceAllocationManager/dashboard/migrations/0005_remove_request_request_date.pyc
new file mode 100644
index 0000000..05d256c
Binary files /dev/null and b/allocation-manager/django/ResourceAllocationManager/dashboard/migrations/0005_remove_request_request_date.pyc differ
diff --git a/allocation-manager/django/ResourceAllocationManager/dashboard/migrations/0006_request_request_date.py b/allocation-manager/django/ResourceAllocationManager/dashboard/migrations/0006_request_request_date.py
new file mode 100644
index 0000000..155aa36
--- /dev/null
+++ b/allocation-manager/django/ResourceAllocationManager/dashboard/migrations/0006_request_request_date.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10 on 2017-12-01 07:11
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('dashboard', '0005_remove_request_request_date'),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name='request',
+ name='request_date',
+ field=models.DateTimeField(blank=True, null=True),
+ ),
+ ]
diff --git a/allocation-manager/django/ResourceAllocationManager/dashboard/migrations/0006_request_request_date.pyc b/allocation-manager/django/ResourceAllocationManager/dashboard/migrations/0006_request_request_date.pyc
new file mode 100644
index 0000000..816d747
Binary files /dev/null and b/allocation-manager/django/ResourceAllocationManager/dashboard/migrations/0006_request_request_date.pyc differ
diff --git a/allocation-manager/django/ResourceAllocationManager/dashboard/models.py b/allocation-manager/django/ResourceAllocationManager/dashboard/models.py
index a17a0fb..d8b9ec8 100644
--- a/allocation-manager/django/ResourceAllocationManager/dashboard/models.py
+++ b/allocation-manager/django/ResourceAllocationManager/dashboard/models.py
@@ -2,19 +2,26 @@ from __future__ import unicode_literals
from django.db import models
from django.core.urlresolvers import reverse
-
-
+#from datetime import date
# Create your models here.
class Request(models.Model):
request_title = models.CharField(max_length=250)
request_description = models.CharField(max_length=500)
request_status = models.CharField(max_length=20)
- request_comments = models.FileField()
allocation_type = models.CharField(max_length=100)
- cpu_hours_requested = models.CharField(max_length=10)
- cpu_hours_allocated = models.CharField(max_length=10)
-
+ applications_to_be_used = models.CharField(max_length=100)
+ disk_usage_range_per_job = models.BigIntegerField()
+ document = models.FileField()
+ field_of_science = models.CharField(max_length=50)
+ keywords = models.CharField(max_length=100)
+ max_memory_per_cpu = models.BigIntegerField()
+ num_cpus_per_job = models.BigIntegerField()
+ request_reviewed_and_funded_by = models.CharField(max_length=100)
+ request_date = models.DateTimeField(blank=True, null=True)
+ service_units = models.BigIntegerField()
+ specific_resource_selection = models.CharField(max_length=100)
+ typical_su_per_job = models.BigIntegerField()
def get_absolute_url(self):
return reverse('dashboard/detail.html', kwargs={'pk': self.pk})
diff --git a/allocation-manager/django/ResourceAllocationManager/dashboard/models.pyc b/allocation-manager/django/ResourceAllocationManager/dashboard/models.pyc
index 75427c8..3c552d2 100644
Binary files a/allocation-manager/django/ResourceAllocationManager/dashboard/models.pyc and b/allocation-manager/django/ResourceAllocationManager/dashboard/models.pyc differ
diff --git a/allocation-manager/django/ResourceAllocationManager/dashboard/templates/dashboard/detail.html b/allocation-manager/django/ResourceAllocationManager/dashboard/templates/dashboard/detail.html
index 0b4b312..34478ee 100644
--- a/allocation-manager/django/ResourceAllocationManager/dashboard/templates/dashboard/detail.html
+++ b/allocation-manager/django/ResourceAllocationManager/dashboard/templates/dashboard/detail.html
@@ -2,7 +2,7 @@
{% block title %} Request Details{% endblock %}
{% block body %}
- <!--<img src="{{ album.album_logo.url }}">-->
+{# <!--<img src="{{ album.album_logo.url }}">-->#}
<h1>{{ request.request_title }}</h1>
<h3>{{ request.request_description }} </h3>
diff --git a/allocation-manager/django/ResourceAllocationManager/dashboard/templates/dashboard/request_form.html b/allocation-manager/django/ResourceAllocationManager/dashboard/templates/dashboard/request_form.html
index 4db6286..dc90d10 100644
--- a/allocation-manager/django/ResourceAllocationManager/dashboard/templates/dashboard/request_form.html
+++ b/allocation-manager/django/ResourceAllocationManager/dashboard/templates/dashboard/request_form.html
@@ -8,16 +8,174 @@
<div class="col-sm-12 col-md-7">
<div class="panel panel-default">
<div class="panel-body">
- <!-- enctype to handle file uploads-->
- <form class="form-horizontal" action="" method="post" enctype="multipart/form-data">
+
+ <!-- Tabular Category of questions in the form-->
+ <ul class="nav nav-pills">
+ <li class="active"><a data-toggle="pill" href="#category1">Category 1</a></li>
+ <li><a data-toggle="pill" href="#category2">Category 2</a></li>
+ <li><a data-toggle="pill" href="#category3">Category 3</a></li>
+ <li><a data-toggle="pill" href="#category4">Category 4</a></li>
+ </ul>
+
+ <div class="tab-content">
+ <div id="category1" class="tab-pane fade in active">
+ <h3>Category One Title</h3>
+ <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>
+ <form class="form-horizontal" action="" method="post" enctype="multipart/form-data">
+ {% csrf_token %}
+{# {% include 'dashboard/form-template.html' %}#}
+ <div class="form-group">
+ <label class="control-label col-sm-2" for="title">Request Title</label>
+ <div class="col-sm-10">
+ <input type="text" class="form-control" id="title" placeholder="Enter Request Title">
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="control-label col-sm-2" for="description">Request Description</label>
+ <div class="col-sm-10">
+ <input type="text" class="form-control" id="description" placeholder="Enter Request Description">
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="control-label col-sm-2" for="allocation-type">Allocation Type</label>
+ <div class="col-sm-10">
+ <div class="dropdown">
+ <button class="btn btn-primary dropdown-toggle" type="button" data-toggle="dropdown">Select Allocation
+ <span class="caret"></span></button>
+ <ul class="dropdown-menu">
+ <li><a href="#">Community</a></li>
+ <li><a href="#">Campus</a></li>
+ <li><a href="#">External</a></li>
+ </ul>
+ </div>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="control-label col-sm-2" for="apps">Applications to be used</label>
+ <div class="col-sm-10">
+ <input type="text" class="form-control" id="apps" placeholder="Enter Applications">
+ </div>
+ </div>
+ <div class="form-group">
+ <ul class="pager">
+ <li><a href="#">Next</a></li>
+ </ul>
+ </div>
+ </form>
+ </div>
+ <div id="category2" class="tab-pane fade">
+ <h3>Category Two</h3>
+ <p>Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.</p>
+ <form class="form-horizontal" action="" method="post" enctype="multipart/form-data">
+ {% csrf_token %}
+{# {% include 'dashboard/form-template.html' %}#}
+ <div class="form-group">
+ <label class="control-label col-sm-2" for="disk-usage">Disk usage range per job</label>
+ <div class="col-sm-10">
+ <input type="range" min="0" max="100" class="form-control" id="disk-usage" placeholder="Enter Disk Usage per Job">
+ </div>
+ </div>
+ <!-- Search for how to upload documents using bootstrap -->
+ <div class="form-group">
+ <label class="control-label col-sm-2" for="documents">Upload</label>
+ <div class="col-sm-10">
+ <input type="text" class="form-control" id="documents" placeholder="Upload Relevant Documents">
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="control-label col-sm-2" for="science-field">Field of Science</label>
+ <div class="col-sm-10">
+ <input type="text" class="form-control" id="science-field" placeholder="Enter Field of Science">
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="control-label col-sm-2" for="keywords">Keywords</label>
+ <div class="col-sm-10">
+ <input type="text" class="form-control" id="keywords" placeholder="Enter Keywords">
+ </div>
+ </div>
+ <div class="form-group">
+ <ul class="pager">
+ <li><a href="#">Previous</a></li>
+ <li><a href="#">Next</a></li>
+ </ul>
+ </div>
+ </form>
+ </div>
+ <div id="category3" class="tab-pane fade">
+ <h3>Category Three</h3>
+ <p>Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium doloremque laudantium, totam rem aperiam.</p>
+ <form class="form-horizontal" action="" method="post" enctype="multipart/form-data">
+ {% csrf_token %}
+{# {% include 'dashboard/form-template.html' %}#}
+ <div class="form-group">
+ <label class="control-label col-sm-2" for="memory-cpu">Max Memory per CPU</label>
+ <div class="col-sm-10">
+ <input type="number" class="form-control" id="memory-cpu" placeholder="Enter Max Memory per CPU">
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="control-label col-sm-2" for="cpu-per-job">Number of CPUs per job</label>
+ <div class="col-sm-10">
+ <input type="number" class="form-control" id="cpu-per-job" placeholder="Enter Number of CPUs per job">
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="control-label col-sm-2" for="request-date">Request Date</label>
+ <div class="col-sm-10">
+ <input type="date" class="form-control" id="request-date" placeholder="Select a Date">
+ </div>
+ </div>
+ <div class="form-group">
+ <ul class="pager">
+ <li><a href="#">Previous</a></li>
+ <li><a href="#">Next</a></li>
+ </ul>
+ </div>
+ </form>
+ </div>
+ <div id="category4" class="tab-pane fade">
+ <h3>Category Four</h3>
+ <p>Eaque ipsa quae ab illo inventore veritatis et quasi architecto beatae vitae dicta sunt explicabo.</p>
+ <form class="form-horizontal" action="" method="post" enctype="multipart/form-data">
+ {% csrf_token %}
+{# {% include 'dashboard/form-template.html' %}#}
+ <div class="form-group">
+ <label class="control-label col-sm-2" for="service-units">Service Units</label>
+ <div class="col-sm-10">
+ <input type="number" class="form-control" id="service-units" placeholder="Enter Service Units">
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="control-label col-sm-2" for="resource-selection">Specific Resource Selection</label>
+ <div class="col-sm-10">
+ <input type="text" class="form-control" id="resource-selection" placeholder="Specific Resource Selection">
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="control-label col-sm-2" for="typical-su">Typical SU per Job</label>
+ <div class="col-sm-10">
+ <input type="number" class="form-control" id="typical-su" placeholder="Enter Typical SU per Job">
+ </div>
+ </div>
+ <div class="form-group">
+ <ul class="pager">
+ <li><a href="#">Previous</a></li>
+ <li><a href="#">Next</a></li>
+ </ul>
+ </div>
+ <form class="form-horizontal" action="" method="post" enctype="multipart/form-data">
{% csrf_token %}
- {% include 'dashboard/form-template.html' %}
+{# {% include 'dashboard/form-template.html' %}#}
<div class="form-group">
<div class="col-sm-offset-2 col-sm-10">
<button type="submit" class="btn btn-success">Submit</button>
</div>
</div>
</form>
+ </form>
+ </div>
+ </div>
</div>
</div>
</div>
diff --git a/allocation-manager/django/ResourceAllocationManager/dashboard/views.py b/allocation-manager/django/ResourceAllocationManager/dashboard/views.py
index 1d3cdd8..5139e55 100644
--- a/allocation-manager/django/ResourceAllocationManager/dashboard/views.py
+++ b/allocation-manager/django/ResourceAllocationManager/dashboard/views.py
@@ -23,13 +23,18 @@ class DetailView(generic.DetailView):
class RequestCreate(CreateView):
model = Request
- fields = ['request_title', 'request_status', 'cpu_hours_requested', 'cpu_hours_allocated']
+ fields = ['request_title', 'request_status', 'request_description', 'allocation_type',
+ 'applications_to_be_used', 'disk_usage_range_per_job', 'document', 'field_of_science',
+ 'keywords', 'max_memory_per_cpu', 'num_cpus_per_job', 'request_reviewed_and_funded_by',
+ 'request_date', 'service_units', 'specific_resource_selection', 'typical_su_per_job']
class RequestUpdate(UpdateView):
model = Request
- fields = ['request_title', 'request_status', 'cpu_hours_requested', 'cpu_hours_allocated']
-
+ fields = ['request_title', 'request_status', 'request_description', 'allocation_type',
+ 'applications_to_be_used', 'disk_usage_range_per_job', 'document', 'field_of_science',
+ 'keywords', 'max_memory_per_cpu', 'num_cpus_per_job', 'request_reviewed_and_funded_by',
+ 'request_date', 'service_units', 'specific_resource_selection', 'typical_su_per_job']
class RequestDelete(DeleteView):
model = Request
diff --git a/allocation-manager/django/ResourceAllocationManager/dashboard/views.pyc b/allocation-manager/django/ResourceAllocationManager/dashboard/views.pyc
index 23eb1ec..ca69975 100644
Binary files a/allocation-manager/django/ResourceAllocationManager/dashboard/views.pyc and b/allocation-manager/django/ResourceAllocationManager/dashboard/views.pyc differ
diff --git a/allocation-manager/django/ResourceAllocationManager/db.sqlite3 b/allocation-manager/django/ResourceAllocationManager/db.sqlite3
index fdac439..871c8b6 100644
Binary files a/allocation-manager/django/ResourceAllocationManager/db.sqlite3 and b/allocation-manager/django/ResourceAllocationManager/db.sqlite3 differ
--
To stop receiving notification emails like this one, please contact
"commits@airavata.apache.org" <co...@airavata.apache.org>.