cleanup and adding leftbehind migration

Author: ecpantalone

ingest/migrations/0017_merge_20230608_1210.py

@@ -0,0 +1,14 @@
+# Generated by Django 3.2.18 on 2023-06-08 12:10
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('ingest', '0015_consortium_projectconsortium'),
+        ('ingest', '0016_swc_swc_uuid'),
+    ]
+
+    operations = [
+    ]

ingest/static/ingest/addprojectusers.js

@@ -15,7 +15,6 @@ function add_users() {
                 }
             )
     });
-     console.log(output_rows);
   fetch(`${window.origin}/ingest/write_user_to_project_people/`, {
       method: "POST",
       credentials: "include",

ingest/static/ingest/changebiladminprivs.js

@@ -7,11 +7,7 @@ function change_bil_admin_privs() {
     output_rows.push({
         "person_id": person_id.getAttribute('value'),
         "is_bil_admin": is_bil_admin.value,
-        })
-  
-    console.log(output_rows)
-     
-                
+        })      
 
   fetch(`${window.origin}/ingest/change_bil_admin_privs/`, {
        method: "POST",

ingest/static/ingest/createproject.js

@@ -12,20 +12,14 @@ function create_new_project() {
 
         if (opt.selected) {
             consortia_ids.push(opt.value);
-            console.log(opt.value);
         }
     }
 
-    console.log(consortia_ids)
-
     output_rows.push({
         "name": name.value,
         "funded_by": funded_by.value,
         "consortia_ids": consortia_ids
-        })
-  
-    console.log(output_rows)
-     
+        })     
 
 
   fetch(`${window.origin}/ingest/create_project/`, {

ingest/static/ingest/linkprojecttocollection.js

@@ -8,12 +8,8 @@ function link_collection_and_project() {
     output_rows.push({
         "project_id": project_id.value,
         "collection_id": collection_id.value
-        })
-  
-    console.log(output_rows)
-     
-                
-            
+        })     
+           
   fetch(`${window.origin}/ingest/descriptive_metadata_upload/`, {
        method: "POST",
        credentials: "include",

ingest/static/ingest/updateusers.js

@@ -1,7 +1,6 @@
 function submit_user_changes() {
     const csrftoken = Cookies.get('csrftoken');
     let auth_id = document.getElementById("auth_id");
-    console.log(auth_id)
     let output_rows = []
     $('tbody>tr').each(function(i, e){
         let $e = $(e);
@@ -16,10 +15,7 @@ function submit_user_changes() {
             "is_pi": is_pi.val(),
             "is_po": is_po.val(),
             "is_bil_admin": is_bil_admin.val()})
-        }
-             console.log(output_rows)
-        
-                
+        }               
 
     });
   fetch(`${window.origin}/ingest/userModify/`, {

ingest/templates/ingest/descriptive_metadata_upload.html

@@ -75,35 +75,30 @@ <h3>Step 3 of 3: Upload metadata for associated submission</h3>
     $(radio1).on('change', () => {
         if (radio1.checked == true) {
         uploadMetadataButton = document.getElementById('UploadMetadata').disabled = false;
-        console.log('upload button is enabled');
         }
      });
 
     $(radio2).on('change', () => {
         if (radio2.checked == true) {
         uploadMetadataButton = document.getElementById('UploadMetadata').disabled = false;
-        console.log('upload button is enabled');
         }
      });
 
     $(radio3).on('change', () => {
         if (radio3.checked == true) {
         uploadMetadataButton = document.getElementById('UploadMetadata').disabled = false;
-        console.log('upload button is enabled');
         }
      });
 
     $(radio4).on('change', () => {
         if (radio4.checked == true) {
         uploadMetadataButton = document.getElementById('UploadMetadata').disabled = false;
-        console.log('upload button is enabled');
         }
      });
 
     $(radio5).on('change', () => {
         if (radio5.checked == true) {
         uploadMetadataButton = document.getElementById('UploadMetadata').disabled = false;
-        console.log('upload button is enabled');
         }
      });
 

ingest/urls.py

@@ -6,38 +6,22 @@
 app_name = 'ingest'
 urlpatterns = [
     path('', views.index, name='index'),
-    # logout and signup should probably be moved somewhere else
     re_path(r'^logout/$', views.logout, name='logout'),
     re_path(r'^signup/$', views.signup, name='signup'),
-    # All the image metadata pages
-    #path('metadata/<int:pk>/', views.ImageMetadataDetail.as_view(), name='image_metadata_detail'),
-    #path('metadata_update/<int:pk>/', views.ImageMetadataUpdate.as_view(), name='image_metadata_update'),
-    #path('metadata_delete/<int:pk>/', views.ImageMetadataDelete.as_view(), name='image_metadata_delete'),
-    #re_path(r'^metadata_create/$', views.image_metadata_create, name='image_metadata_create'),
-    #re_path(r'^metadata_upload/$', views.image_metadata_upload, name='image_metadata_upload'),
-    #re_path(r'^metadata_list/$', views.image_metadata_list, name='image_metadata_list'),
-    # All the descriptive metadata pages
     path('descriptive_metadata/<int:pk>/', views.DescriptiveMetadataDetail.as_view(), name='descriptive_metadata_detail'),
-    #AJR --- NEED TO FIX THESE AND UNCOMMENT.
-    #path('descriptive_metadata_update/<int:pk>/', views.DescriptiveMetadataUpdate.as_view(), name='descriptive_metadata_update'),
-    #path('descriptive_metadata_delete/<int:pk>/', views.DescriptiveMetadataDelete.as_view(), name='descriptive_metadata_delete'),
-    #re_path(r'^descriptive_metadata_create/$', views.descriptive_metadata_create, name='descriptive_metadata_create'),
     re_path(r'^descriptive_metadata_upload/$', views.descriptive_metadata_upload, name='descriptive_metadata_upload'),
     re_path(r'^descriptive_metadata_list/$', views.descriptive_metadata_list, name='descriptive_metadata_list'),
-    # All the collection pages.
     path('collection_update/<int:pk>', views.CollectionUpdate.as_view(), name='collection_update'),
     path('collection_delete/<int:pk>', views.collection_delete, name='collection_delete'),
     path('collection/<int:pk>', views.collection_detail, name='collection_detail'),
     path('collection_data_path/<int:pk>', views.collection_data_path, name='collection_data_path'),
     path('collection_validation_results/<int:pk>', views.collection_validation_results, name='collection_validation_results'),
     path('collection_submission_results/<int:pk>', views.collection_submission_results, name='collection_submission_results'),
-    #path('manageUsers', views.manageUsers, name = 'manage_users'),
     re_path(r'^collection_create/$', views.collection_create, name='collection_create'),
     re_path(r'^collection_list/$', views.CollectionList.as_view(), name='collection_list'),
     re_path(r'^submit_validate_collection_list/$', views.SubmitValidateCollectionList.as_view(), name='submit_validate_collection_list'),
     re_path(r'^submit_request_collection_list/$', views.SubmitRequestCollectionList.as_view(), name ='submit_request_collection_list'),
     re_path(r'^collection_send/$', views.collection_send, name = 'collection_send'),
-    #re_path(r'^manageUsers/$', views.manageUsers, name = 'manageUsers'),
     re_path(r'^userModify/$', views.userModify, name = 'userModify'),
     re_path(r'^manage_projects/$', views.manageProjects, name = 'manage_projects'),
     re_path(r'^manage_collections/$', views.manageCollections, name = 'manage_collections'),

ingest/views.py

@@ -252,7 +252,6 @@ def project_form(request):
 @login_required
 def create_project(request):
     new_project = json.loads(request.body)
-    print(new_project)
     items = []
     for item in new_project:
         items.append(item['funded_by'])
@@ -1566,7 +1565,6 @@ def save_sheet_row(ingest_method, filename, collection):
     return sheet
 
 def save_contributors_sheet(contributors, sheet):
-    # saved_contributors = []
     try:
         for c in contributors:
             contributorname = c['contributorName']
@@ -1582,8 +1580,6 @@ def save_contributors_sheet(contributors, sheet):
             contributor = Contributor(contributorname=contributorname, creator=creator, contributortype=contributortype, nametype=nametype, nameidentifier=nameidentifier, nameidentifierscheme=nameidentifierscheme, affiliation=affiliation, affiliationidentifier=affiliationidentifier, affiliationidentifierscheme=affiliationidentifierscheme, sheet_id=sheet.id)
             contributor.save()
 
-            print(contributor)
-            # contributors.append(contributor)
         return True
     except Exception as e:
         print(repr(e))