Updated code

bcgov · Apr 21, 2017 · 0c6d178 · 0c6d178
1 parent fc0816b
commit 0c6d178
Show file tree

Hide file tree

Showing 48 changed files with 2,985 additions and 2,667 deletions.
diff --git a/TFRS.pyproj b/TFRS.pyproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
     <Name>tfrs</Name>
-    <RootNamespace>TFRS</RootNamespace>
+    <RootNamespace>tfrs</RootNamespace>
     <DjangoSettingsModule>tfrs.settings</DjangoSettingsModule>
   </PropertyGroup>
   <PropertyGroup>
@@ -31,10 +31,10 @@
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="manage.py" />
+    <Compile Include="server\admin.py" />
     <Compile Include="server\database.py" />
     <Compile Include="server\migrations\0001_initial.py" />
     <Compile Include="server\migrations\0002_auto_20170214_1526.py" />
-    <Compile Include="server\migrations\0003_auto_20170419_1214.py" />
     <Compile Include="server\migrations\__init__.py" />
     <Compile Include="server\models\Attachment.py" />
     <Compile Include="server\models\AttachmentViewModel.py" />
@@ -72,27 +72,10 @@
     <Compile Include="server\models\__init__.py" />
     <Compile Include="server\serializers.py" />
     <Compile Include="server\test_api.py" />
-    <Compile Include="server\test_models.py" />
+    <Compile Include="server\views.py" />
+    <Compile Include="tfrs\test_models.py" />
     <Compile Include="server\urls.py" />
-    <Compile Include="server\views\Attachment.py" />
-    <Compile Include="server\views\CompliancePeriod.py" />
-    <Compile Include="server\views\Contact.py" />
-    <Compile Include="server\views\CreditTrade.py" />
-    <Compile Include="server\views\CreditTradeLogEntry.py" />
-    <Compile Include="server\views\CurrentUser.py" />
-    <Compile Include="server\views\FuelSupplier.py" />
-    <Compile Include="server\views\Group.py" />
-    <Compile Include="server\views\History.py" />
-    <Compile Include="server\views\LookupList.py" />
-    <Compile Include="server\views\Note.py" />
-    <Compile Include="server\views\Notification.py" />
-    <Compile Include="server\views\NotificationEvent.py" />
-    <Compile Include="server\views\Permission.py" />
-    <Compile Include="server\views\Role.py" />
-    <Compile Include="server\views\User.py" />
-    <Compile Include="server\views\__init__.py" />
     <Compile Include="server\__init__.py" />
-    <Compile Include="tfrs\admin.py" />
     <Compile Include="tfrs\database.py" />
     <Compile Include="tfrs\settings.py" />
     <Compile Include="tfrs\urls.py">
@@ -110,10 +93,6 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="requirements.txt" />
-    <Content Include="server\migrations\__pycache__\0001_initial.cpython-35.pyc" />
-    <Content Include="server\migrations\__pycache__\0002_auto_20170214_1526.cpython-35.pyc" />
-    <Content Include="server\migrations\__pycache__\0003_auto_20170419_1214.cpython-35.pyc" />
-    <Content Include="server\migrations\__pycache__\__init__.cpython-35.pyc" />
     <Content Include="server\models\__pycache__\Attachment.cpython-35.pyc" />
     <Content Include="server\models\__pycache__\AttachmentViewModel.cpython-35.pyc" />
     <Content Include="server\models\__pycache__\Audit.cpython-35.pyc" />
@@ -124,32 +103,12 @@
     <Content Include="server\models\__pycache__\History.cpython-35.pyc" />
     <Content Include="server\models\__pycache__\Note.cpython-35.pyc" />
     <Content Include="server\models\__pycache__\__init__.cpython-35.pyc" />
-    <Content Include="server\views\__pycache__\Attachment.cpython-35.pyc" />
-    <Content Include="server\views\__pycache__\CompliancePeriod.cpython-35.pyc" />
-    <Content Include="server\views\__pycache__\Contact.cpython-35.pyc" />
-    <Content Include="server\views\__pycache__\CreditTrade.cpython-35.pyc" />
-    <Content Include="server\views\__pycache__\CreditTradeLogEntry.cpython-35.pyc" />
-    <Content Include="server\views\__pycache__\CurrentUser.cpython-35.pyc" />
-    <Content Include="server\views\__pycache__\FuelSupplier.cpython-35.pyc" />
-    <Content Include="server\views\__pycache__\Group.cpython-35.pyc" />
-    <Content Include="server\views\__pycache__\History.cpython-35.pyc" />
-    <Content Include="server\views\__pycache__\LookupList.cpython-35.pyc" />
-    <Content Include="server\views\__pycache__\Note.cpython-35.pyc" />
-    <Content Include="server\views\__pycache__\Notification.cpython-35.pyc" />
-    <Content Include="server\views\__pycache__\NotificationEvent.cpython-35.pyc" />
-    <Content Include="server\views\__pycache__\Permission.cpython-35.pyc" />
-    <Content Include="server\views\__pycache__\Role.cpython-35.pyc" />
-    <Content Include="server\views\__pycache__\User.cpython-35.pyc" />
-    <Content Include="server\views\__pycache__\__init__.cpython-35.pyc" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="server\" />
     <Folder Include="server\migrations\" />
-    <Folder Include="server\migrations\__pycache__\" />
     <Folder Include="server\models\" />
     <Folder Include="server\models\__pycache__\" />
-    <Folder Include="server\views\" />
-    <Folder Include="server\views\__pycache__\" />
     <Folder Include="welcome\" />
     <Folder Include="tfrs\" />
   </ItemGroup>

diff --git a/requirements.txt b/requirements.txt
@@ -5,6 +5,7 @@ psycopg2==2.7.1
 whitenoise==3.0
 django-extensions==1.7.7
 djangorestframework==3.6.2
+djangorestframework-bulk==0.2.1
 # Optional packages which may be used with REST framework.
 markdown===2.6.8
 django-filter===1.0.2

diff --git a/server/admin.py b/server/admin.py
@@ -0,0 +1,91 @@
+"""
+    REST API Documentation for the NRS TFRS Credit Trading Application
+
+    The Transportation Fuels Reporting System is being designed to streamline compliance reporting for transportation fuel suppliers in accordance with the Renewable & Low Carbon Fuel Requirements Regulation.
+
+    OpenAPI spec version: v1
+        
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+"""
+
+from django.contrib import admin
+from .models.Attachment import Attachment
+from .models.AttachmentViewModel import AttachmentViewModel
+from .models.Audit import Audit
+from .models.CompliancePeriod import CompliancePeriod
+from .models.Contact import Contact
+from .models.CreditTrade import CreditTrade
+from .models.CreditTradeLogEntry import CreditTradeLogEntry
+from .models.CurrentUserViewModel import CurrentUserViewModel
+from .models.FuelSupplier import FuelSupplier
+from .models.Group import Group
+from .models.GroupMembership import GroupMembership
+from .models.GroupMembershipViewModel import GroupMembershipViewModel
+from .models.GroupViewModel import GroupViewModel
+from .models.History import History
+from .models.HistoryViewModel import HistoryViewModel
+from .models.LookupList import LookupList
+from .models.Note import Note
+from .models.Notification import Notification
+from .models.NotificationEvent import NotificationEvent
+from .models.NotificationViewModel import NotificationViewModel
+from .models.Permission import Permission
+from .models.PermissionViewModel import PermissionViewModel
+from .models.Role import Role
+from .models.RolePermission import RolePermission
+from .models.RolePermissionViewModel import RolePermissionViewModel
+from .models.RoleViewModel import RoleViewModel
+from .models.User import User
+from .models.UserDetailsViewModel import UserDetailsViewModel
+from .models.UserFavourite import UserFavourite
+from .models.UserFavouriteViewModel import UserFavouriteViewModel
+from .models.UserRole import UserRole
+from .models.UserRoleViewModel import UserRoleViewModel
+from .models.UserViewModel import UserViewModel
+
+
+
+admin.site.register(Attachment)
+admin.site.register(AttachmentViewModel)
+admin.site.register(Audit)
+admin.site.register(CompliancePeriod)
+admin.site.register(Contact)
+admin.site.register(CreditTrade)
+admin.site.register(CreditTradeLogEntry)
+admin.site.register(CurrentUserViewModel)
+admin.site.register(FuelSupplier)
+admin.site.register(Group)
+admin.site.register(GroupMembership)
+admin.site.register(GroupMembershipViewModel)
+admin.site.register(GroupViewModel)
+admin.site.register(History)
+admin.site.register(HistoryViewModel)
+admin.site.register(LookupList)
+admin.site.register(Note)
+admin.site.register(Notification)
+admin.site.register(NotificationEvent)
+admin.site.register(NotificationViewModel)
+admin.site.register(Permission)
+admin.site.register(PermissionViewModel)
+admin.site.register(Role)
+admin.site.register(RolePermission)
+admin.site.register(RolePermissionViewModel)
+admin.site.register(RoleViewModel)
+admin.site.register(User)
+admin.site.register(UserDetailsViewModel)
+admin.site.register(UserFavourite)
+admin.site.register(UserFavouriteViewModel)
+admin.site.register(UserRole)
+admin.site.register(UserRoleViewModel)
+admin.site.register(UserViewModel)
diff --git a/server/migrations/0001_initial.py b/server/migrations/0001_initial.py
@@ -31,20 +31,20 @@ class Migration(migrations.Migration):
                 ('quantity', models.IntegerField()),
                 ('supply_year', models.DateField(verbose_name='year')),
                 ('last_modified', models.DateField(auto_now=True)),
-                ('fuel_supplier', models.ForeignKey(to='tfrs.FuelSupplier')),
+                ('fuel_supplier', models.ForeignKey(to='server.FuelSupplier')),
             ],
         ),
         migrations.CreateModel(
             name='FuelType',
             fields=[
                 ('id', models.AutoField(verbose_name='ID', primary_key=True, serialize=False, auto_created=True)),
                 ('name', models.CharField(max_length=100)),
-                ('fuel_class', models.ForeignKey(to='tfrs.FuelClass')),
+                ('fuel_class', models.ForeignKey(to='server.FuelClass')),
             ],
         ),
         migrations.AddField(
             model_name='fuelsupply',
             name='fuel_type',
-            field=models.ForeignKey(to='tfrs.FuelType'),
+            field=models.ForeignKey(to='server.FuelType'),
         ),
     ]
diff --git a/server/migrations/0003_auto_20170419_1214.py b/server/migrations/0003_auto_20170419_1214.py