Skip to content
This repository has been archived by the owner on Jan 26, 2021. It is now read-only.

Added description field in events #723

Merged
merged 2 commits into from
Aug 1, 2018
Merged

Added description field in events #723

merged 2 commits into from
Aug 1, 2018

Conversation

anjali-dhanuka
Copy link
Contributor

@anjali-dhanuka anjali-dhanuka commented Jun 12, 2018 •
edited
Loading

Description

Added description field for events

Fixes #722

Type of Change:

  • Code

Code/Quality Assurance Only

  • New feature (non-breaking change which adds functionality pre-approved by mentors)

How Has This Been Tested?

image
image

Checklist:

  • My PR follows the style guidelines of this project
  • I have performed a self-review of my own code or materials
  • I have commented my code or provided relevant documentation, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • Any dependent changes have been merged

Code/Quality Assurance Only

  • My changes generate no new warnings
  • I have added tests that prove my fix is effective or that my feature works
  • New and existing unit tests pass locally with my changes
  • Any dependent changes have been published in downstream modules

@anjali-dhanuka
Copy link
Contributor Author

Hi @abhishekarya286 @ayushgarg1804 @kamsuri Please review

kamsuri
kamsuri reviewed Jun 14, 2018
View reviewed changes
vms/event/models.py Outdated
description = models.TextField(
blank=True,
validators=[
RegexValidator(r'^[(A-Z)|(a-z)|(0-9)|(\s)|(\.)|(,)|(\-)|(!)]+$', ),
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this define all the possibilities for description field?
I think it limits a few rather.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@kamsuri I guess I need to remove these validations, since in portal there are not any.

@mayburgos mayburgos added the Program: GSOC Related to work completed during the Google Summer of Code Program. label Jun 17, 2018
ayushgarg1804
ayushgarg1804 previously requested changes Jun 21, 2018
View reviewed changes
Copy link

@ayushgarg1804 ayushgarg1804 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also require tests before merge

vms/event/templates/event/create.html Outdated
@@ -44,7 +44,28 @@
</div>
</div>
{% endif %}

{% if form.description.errors %}
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

minor: indentation

vms/event/models.py Outdated
@@ -12,6 +12,8 @@ class Event(models.Model):
r'^[(A-Z)|(a-z)|(0-9)|(\s)|(\.)|(,)|(\-)|(!)|(\')]+$', ),
],
)
description = models.TextField(
blank=True)
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

minor: change it to same line.

@anjali-dhanuka
Copy link
Contributor Author

@ayushgarg1804 Done with the changes, please review.

@anjali-dhanuka anjali-dhanuka requested a review from abarya June 22, 2018 07:52
@anitab-org anitab-org deleted a comment Jun 24, 2018
@anitab-org anitab-org deleted a comment Jun 24, 2018
@anitab-org anitab-org deleted a comment Jun 24, 2018
@anitab-org anitab-org deleted a comment Jun 24, 2018
@anitab-org anitab-org deleted a comment Jun 24, 2018
@anitab-org anitab-org deleted a comment Jun 24, 2018
@anitab-org anitab-org deleted a comment Jun 24, 2018
@anitab-org anitab-org deleted a comment Jun 24, 2018
@anitab-org anitab-org deleted a comment Jun 24, 2018
@anjali-dhanuka
Copy link
Contributor Author

Hi @ayushgarg1804 @abhishekarya286 @kamsuri Done with the tests for this PR. Please review.

@anjali-dhanuka anjali-dhanuka requested a review from Monal5031 June 24, 2018 12:58
ayushgarg1804
ayushgarg1804 reviewed Jun 24, 2018
View reviewed changes
Copy link

@ayushgarg1804 ayushgarg1804 left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please remove commit 77a6c23 in the PR

@anjali-dhanuka
Copy link
Contributor Author

@ayushgarg1804 Done with removing the commit. Please review.

@anitab-org anitab-org deleted a comment Jun 24, 2018
@anitab-org anitab-org deleted a comment Jun 24, 2018
@anitab-org anitab-org deleted a comment Jun 24, 2018
@anitab-org anitab-org deleted a comment Jun 24, 2018
@anitab-org anitab-org deleted a comment Jun 24, 2018
@anitab-org anitab-org deleted a comment Jun 24, 2018
@anjali-dhanuka anjali-dhanuka force-pushed the description_in_event branch 3 times, most recently from 4a71261 to 322decc Compare July 7, 2018 23:16
@mayburgos mayburgos added Program: GSOC Related to work completed during the Google Summer of Code Program. and removed Program: GSOC Related to work completed during the Google Summer of Code Program. labels Jul 16, 2018
@Monal5031
Copy link
Contributor

@anjali-dhanuka UI tests missing, please update.

@anjali-dhanuka
Copy link
Contributor Author

@Monal5031 But there are no constraints on description field, it's just a simple TextField so no UI errors are going to appear. I was in dilemna before regarding this so I was waiting for you to complete
#766 so that I could see how you write UI tests for job description, but it seems you haven't written them for job too.

@anjali-dhanuka anjali-dhanuka force-pushed the description_in_event branch 2 times, most recently from 2df4e12 to 422306d Compare July 30, 2018 20:32
@anjali-dhanuka
Copy link
Contributor Author

Hi @abhishekarya286 @kamsuri @nida Please review

@Monal5031
Copy link
Contributor

@anjali-dhanuka You can add a UI test for display of correct description, since we can't add for errors we can skip that test

@anjali-dhanuka
Copy link
Contributor Author

@Monal5031 There is no view where the description of an event is shown.

@Monal5031
Copy link
Contributor

You can create an event with description and view its contents in form edit. That can work as display of event description IMO

@anjali-dhanuka
Copy link
Contributor Author

@Monal5031 Done with the UI tests I added a check in the detail view, please review. Also @abhishekarya286 @kamsuri @nida Please review

@Monal5031
Copy link
Contributor

@anjali-dhanuka travis failing, please restart it im on mobile atm

@anjali-dhanuka
description field added
e703526 
validations removed

formatting implemented
@anjali-dhanuka
tests also added
4419e21 
description field tests added

list indexed

str removed and create_event function changed

save issues solved

vola api updated with description

UI tests for description added
abarya
abarya approved these changes Aug 1, 2018
View reviewed changes
Copy link
Contributor

@abarya abarya left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@abarya abarya dismissed ayushgarg1804’s stale review August 1, 2018 18:56

Not active now.

@abarya abarya merged commit 97719cc into anitab-org:gsoc18-code Aug 1, 2018
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@Monal5031 Monal5031 Monal5031 left review comments

@ayushgarg1804 ayushgarg1804 ayushgarg1804 left review comments

@abarya abarya abarya approved these changes

@kamsuri kamsuri kamsuri approved these changes

Assignees

@abarya abarya

Labels
Category: Coding Changes to code base or refactored code that doesn't fix a bug. Program: GSOC Related to work completed during the Google Summer of Code Program.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@anjali-dhanuka @abarya @Monal5031 @kamsuri @ayushgarg1804 @nida @mayburgos