Merge pull request #721 from ODM2/develop

Bug Fixes for 0.17.0

src/dataloaderinterface/templates/includes/site-form-fieldset.template.html

@@ -4,7 +4,6 @@
     <br>
     <div class="row">
         <div class="form-group col-sm-12 col-md-6 sampling-feature-fields">
-            {% if user.is_staff %}
             <div class="form-field {% if form.organization_id.field.required %} required-field{% endif %}{% if form.organization_id.errors %} has-error{% endif %}"
                  data-field="{{ form.organization_id.display_name }}">
                 <label class="control-label"
@@ -18,7 +17,6 @@
                 </div>
                 {{ form.organization_id|add_class:"form-control input-sm" }}
             </div>
-            {% endif %}
 
             <div class="form-field {% if form.sampling_feature_code.field.required %} required-field{% endif %}{% if form.sampling_feature_code.errors %} has-error{% endif %}"
                  data-field="{{ form.sampling_feature_code.name }}">

src/dataloaderinterface/views.py

@@ -40,6 +40,8 @@
 
 from odm2 import odm2datamodels
 from sqlalchemy import text
+from odm2.crud.organization import read_organization_names 
+from odm2 import create_session
 
 class LoginRequiredMixin(object):
     @classmethod
@@ -409,12 +411,10 @@ def get_form(self, form_class=None):
         user = self.request.user
         organization_ids = [a.organization.organization_id for a in user.affiliation]
         #for staff/admins if users is site admin they should see all organizations 
-        if not user.is_staff:
+        if user.is_staff:
             organization_ids = None
 
         choices = []
-        from odm2.crud.organizations import read_organization_names 
-        from odm2 import create_session
         session = create_session()
         organizations = read_organization_names(session, organization_ids)
 

src/dataloaderservices/csv_templates/source_info_template.txt

@@ -1,9 +1,6 @@
-# Source Information
-# ------------------
-# Organization: {affiliation.organization}
-# SourceLink: {source_link}
-# ContactName: {affiliation.account_id.accountfirstname} {affiliation.account_id.accountlastname}
-# Phone: {affiliation.primary_phone}
-# Email: {affiliation.primary_email}
-# Citation: {citation}
-#
+# Source Information
+# ------------------
+# Organization: {organization.display_name}
+# SourceLink: {source_link}
+# Citation: {citation}
+#

src/dataloaderservices/views.py

@@ -95,7 +95,7 @@ def post(self, request, format=None):
         height = form.cleaned_data["height"]
         notes = form.cleaned_data["sensor_notes"]
 
-        #create action-by record
+        # create action-by record
         affiliation = None
         for a in self.request.user.affiliation:
             if a.organization_id == registration.organization_id:
@@ -682,7 +682,8 @@ def generate_metadata(
         # Write Source Information data
 
         # affiliation = tsr.result.feature_action.action.people.first()
-        affiliation = site_sensor.registration.odm2_affiliation
+        # affiliation = site_sensor.registration.odm2_affiliation
+        organization = site_sensor.registration.organization
         annotation = tsr.result.annotations.first()
         citation = (
             annotation.citation.title if annotation and annotation.citation else ""
@@ -706,7 +707,7 @@ def generate_metadata(
             )
 
         metadata += CSVDataApi.read_file("source_info_template.txt").format(
-            affiliation=affiliation, citation=citation, source_link=source_link
+            organization=organization, citation=citation, source_link=source_link
         )
 
         return metadata

src/odm2/crud/__init__.py

@@ -0,0 +1,2 @@
+import odm2.crud.organization
+import odm2.crud.users

src/odm2/crud/organizations.py → src/odm2/crud/organization.py

@@ -1,3 +1,5 @@
+from datetime import datetime
+
 from typing import List, Optional, Tuple
 from sqlalchemy.orm import Session
 
@@ -6,6 +8,32 @@
 models = odm2datamodels.models
 session = odm2datamodels.odm2_engine.session_maker
 
+def create_individual_organization(
+    account: models.Accounts,
+    session: Session = session(),
+) -> None:
+    #create organization model
+    organization = models.Organizations()
+    organization.organizationtypecv = 'Individual'
+    organization.organizationcode = f'individual_org_account_{account.accountid}'
+    organization.organizationname = f'individual_org_account_{account.accountid}'
+
+    #create organization record
+    session.add(organization)
+    session.commit()
+
+    #make affiliation record to tie new organization to account
+    affiliation = models.Affiliations()
+    affiliation.organizationid=organization.organizationid
+    affiliation.isprimaryorganizationcontact=True
+    affiliation.affiliationstartdate = datetime.today()
+    affiliation.primaryemail = account.accountemail
+    affiliation.accountid = account.accountid
+
+    #add record to database
+    session.add(affiliation)
+    session.commit()
+
 def read_organization_names(
     session: Session = session(), 
     organization_ids:Optional[List[int]]=None,

src/odm2/models/__init__.py

@@ -0,0 +1 @@
+import odm2.models.base

src/odm2/models/base.py

@@ -0,0 +1,3 @@
+from sqlalchemy.orm import declarative_base
+
+Base = declarative_base()

src/odm2/models/results.py

@@ -4,10 +4,7 @@
 from sqlalchemy import orm
 import sqlalchemy as sqla
 from sqlalchemy.dialects import postgresql as pg
-from sqlalchemy.orm import declarative_base
-
-Base = declarative_base()
-
+from odm2.models.base import Base
 
 class TimeSeriesResults(Base):
     """http://odm2.github.io/ODM2/schemas/ODM2_Current/tables/ODM2Results_TimeSeriesResults.html"""
@@ -47,7 +44,6 @@ class TimeSeriesResults(Base):
         "aggregationstaticcv", sqla.ForeignKey("cv_aggregationstatistic.term")
     )
 
-
 class TimeSeriesResultValues(Base):
     """http://odm2.github.io/ODM2/schemas/ODM2_Current/tables/ODM2Results_TimeSeriesResultValues.html"""
 

src/streamwatch/views.py

@@ -183,7 +183,7 @@ def get_context_data(self, **kwargs):
         ] = user.is_authenticated and user.can_administer_site(
             registration.sampling_feature_id
         )
-        context["is_site_owner"] = user.id == registration.django_user
+        context["is_site_owner"] = registration.organization_id in user.organization_id
         context["sampling_feature_code"] = self.kwargs[self.slug_field]
         context["action_id"] = int(self.kwargs["pk"])
         return context