Issue 25 attribution change #48

brandonrosenbloom · 2021-05-17T14:29:54Z

SEVERAL CHANGES:

Added .idea files to gitignore to help keep the repo clean
Added several models to the Resources app in order to help better organize the data while also providing future adjustability.
Created a basic author form so new authors could be created while also adding the necessary admin settings. STILL NOT DONE.

-Added extra installation instructions for Mac users -Added database setup using migrate command

This reverts commit 87d35cd.

Co-authored-by: Martin Breuss breuss.martin@gmail.com -Added extra installation instructions for Mac users -Added database setup using migrate command

19: Improve installation instructions

…or data.

…ke resource status, devices, audiance, etc. Did this so as new values were required, we wouldn't require a code change/redeployment of the application.

Registered new models with admin. Created new migration. Added __str__ method to all new models. Updated resource list view to return all resources for now. Will need to update to only allow for approved resources in the future.

Commented out language field as it was replaced by a many to many field.

Deleted the choices file and removed references in models.py, views.py and commented references in tests.py. Need to update the tests to utilize the appropriate models instead of the choices file.

Removed the multiselectfield import as it was no longer being used.

Added a sequence field to the ResourceStatus model so we can programmatically identify the Proposed status without having to rely on the "Proposed" value itself. This will allow us to change the status name if needed.

Added logic to default the status of a resource to the first status in the sequence so we can change the name of the status in the future if needed.

Removed unnecessary comments and fields that no longer exist on the Resource model.

Updated model name to remove pluralization. Added more details admin capabilities for all models.

Created CreateResourceForm in forms.py and updated views.py to utilize the new custom form. This form will more appropriately handle multiselect fields. Still need to add the ability to add a new author.

Updated resource list form to utilize the newly created fields/models. Also appears to have fixed the filters functionality as well.

sijanonly · 2021-06-06T11:42:00Z

python-in-edu/resources/models.py



+def get_initial_status():


This is raising issue while migration. I think the issue is because of the fact that ResourceStatus won't exist until this point?
I have attached the screenshot herewith.

python-in-edu/resources/models.py

Created a data migration file that will be used to automatically populate several tables within the DB.

brandonrosenbloom · 2021-06-08T18:47:51Z

@sijanonly I have now added the data migration file. You should be able to pull the latest version of this request down and run migrate to see the data appear.

sijanonly · 2021-06-08T19:13:49Z

@sijanonly I have now added the data migration file. You should be able to pull the latest version of this request down and run migrate to see the data appear.

@brandonrosenbloom I am still getting this issue while running migration.

can you please have a look?

Updated get_initial_status to return None if there is no default status available.

Removed unneeded period.

brandonrosenbloom · 2021-06-08T21:47:52Z

@sijanonly Try now. I've updated the get_default_value method to return a none if there are no values available.

sijanonly · 2021-06-09T07:09:33Z

@sijanonly Try now. I've updated the get_default_value method to return a none if there are no values available.

@brandonrosenbloom , the changes didn't work. Actually, the statement ResourceStatus.objects.get(sequence=1).id will raise error since it won't find the ResourceStatus object. I changed it to following and it works.

def get_initial_status():
    try:
        initial_status = ResourceStatus.objects.get(sequence=1).id
    except ResourceStatus.DoesNotExist:
        initial_status = None
    return initial_status

Also, there is one issue I am facing while creating user. I tried to create superuser python manage.py createsuperuser
and Profile model has populations field, which is NOT NULL. And it raises
django.db.utils.IntegrityError: NOT NULL constraint failed: resources_profile.populations_id

I think it's better to set null=True for populations field in Profile model.

@sijanonly

Added try/except logic to get_initial_status method as recommended by @sijanonly

brandonrosenbloom · 2021-06-09T20:00:57Z

@sijanonly I've applied the change to the get_initial_status method as suggested. @meg-ray Do we want to guarantee that all profiles have a population entered?

sijanonly · 2021-06-13T17:36:25Z

@sijanonly I've applied the change to the get_initial_status method as suggested. @meg-ray Do we want to guarantee that all profiles have a population entered?

@brandonrosenbloom I just found that there is a separate ProfileUpdateView where user can update populations,.. information. It seems like we can put None for default ?

brandonrosenbloom · 2021-06-14T17:03:59Z

@sijanonly The only issue I see with setting the population attribute to None on the model is really how it may impact the business process by which users are created. @meg-ray if we don't expect new users to always be created with a population value, then setting the value to no longer be required makes sense. However, if we expect all new users to have a population to be identified when they are first created, then we should probably leave the field as required. Thoughts?

aeltanawy and others added 10 commits May 15, 2021 13:56

19: Improve installation instructions

87d35cd

-Added extra installation instructions for Mac users -Added database setup using migrate command

Revert "19: Improve installation instructions" to add co-authors

1fcf6a4

This reverts commit 87d35cd.

19: Improve installation instructions

5e6b501

Co-authored-by: Martin Breuss breuss.martin@gmail.com -Added extra installation instructions for Mac users -Added database setup using migrate command

adding static resources

194e81d

Update to getting started page

abe75ea

force https on heroku

1d77f74

Merge pull request psf#22 from aeltanawy/master

7df7d2e

19: Improve installation instructions

Added .idea to the gitignore file

628219f

Added new Author model and created the necessary forms to manage Auth…

c10c7b1

…or data.

Updated DB modeling to have specific tables/models for information li…

4410db7

…ke resource status, devices, audiance, etc. Did this so as new values were required, we wouldn't require a code change/redeployment of the application.

brandonrosenbloom marked this pull request as draft May 17, 2021 14:30

This was linked to issues May 20, 2021

Refactor modeling #51

Open

Resources Database Model - Change "Attribution" to "Author" #39

Open

brandon.rosenbloom added 10 commits May 20, 2021 14:57

Admin file/model changes

b4cd904

Registered new models with admin. Created new migration. Added __str__ method to all new models. Updated resource list view to return all resources for now. Will need to update to only allow for approved resources in the future.

Update models.py

0d1039d

Commented out language field as it was replaced by a many to many field.

Deleted choices file

9e98212

Deleted the choices file and removed references in models.py, views.py and commented references in tests.py. Need to update the tests to utilize the appropriate models instead of the choices file.

Update models.py

cd1901e

Removed the multiselectfield import as it was no longer being used.

Resource Status Sequencing

5cac80a

Added a sequence field to the ResourceStatus model so we can programmatically identify the Proposed status without having to rely on the "Proposed" value itself. This will allow us to change the status name if needed.

Resource Status Default Logic

440f29a

Added logic to default the status of a resource to the first status in the sequence so we can change the name of the status in the future if needed.

Code Cleanup

6764916

Removed unnecessary comments and fields that no longer exist on the Resource model.

Model/Admin updates

ebf552b

Updated model name to remove pluralization. Added more details admin capabilities for all models.

Form update

4befbe2

Created CreateResourceForm in forms.py and updated views.py to utilize the new custom form. This form will more appropriately handle multiselect fields. Still need to add the ability to add a new author.

Update resource_list.html

137fe51

Updated resource list form to utilize the newly created fields/models. Also appears to have fixed the filters functionality as well.

sijanonly reviewed Jun 6, 2021

View reviewed changes

python-in-edu/resources/models.py Show resolved Hide resolved

Create 0014_auto_20210607_1959.py

4f52f12

Created a data migration file that will be used to automatically populate several tables within the DB.

Update models.py

e25b5f7

Updated get_initial_status to return None if there is no default status available.

Migration update

74b6c5c

Removed unneeded period.

Update models.py

861df33

Added try/except logic to get_initial_status method as recommended by @sijanonly

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Issue 25 attribution change #48

Issue 25 attribution change #48

brandonrosenbloom commented May 17, 2021

sijanonly Jun 6, 2021

brandonrosenbloom commented Jun 8, 2021

sijanonly commented Jun 8, 2021

brandonrosenbloom commented Jun 8, 2021

sijanonly commented Jun 9, 2021

brandonrosenbloom commented Jun 9, 2021

sijanonly commented Jun 13, 2021

brandonrosenbloom commented Jun 14, 2021

Issue 25 attribution change #48

Are you sure you want to change the base?

Issue 25 attribution change #48

Conversation

brandonrosenbloom commented May 17, 2021

sijanonly Jun 6, 2021

Choose a reason for hiding this comment

brandonrosenbloom commented Jun 8, 2021

sijanonly commented Jun 8, 2021

brandonrosenbloom commented Jun 8, 2021

sijanonly commented Jun 9, 2021

brandonrosenbloom commented Jun 9, 2021

sijanonly commented Jun 13, 2021

brandonrosenbloom commented Jun 14, 2021