project_types (formerly work schemes) #1098

owocki · 2018-05-07T23:39:07Z

Description

Support for

traditional
cooperative
competitive

work schemes

and

permissionless
appproval required

to release

QA the shit out of this
what else?

Checklist

linter status: 100% pass
changes don't break existing behavior
commit message follows commit guidelines

Affected core subsystem(s)

all of it

Testing

tested it

Refers/Fixes

#973

stickler-ci · 2018-05-07T23:39:36Z

app/assets/v2/js/pages/dashboard.js

-  'tech_stack'
+  'tech_stack',
+  'work_scheme',
+  'application_scheme',


Unexpected trailing comma. (comma-dangle)

stickler-ci · 2018-05-07T23:39:36Z

app/assets/v2/js/pages/dashboard.js

@@ -452,8 +454,8 @@ var refreshBounties = function(event) {
      result.action = result['url'];
      result['title'] = result['title'] ? result['title'] : result['github_url'];

-
-      result['p'] = ((result['experience_level'] ? result['experience_level'] : 'Unknown Experience Level') + ' &bull; ');
+      var work_scheme = ucwords(result['work_scheme']) + ' &bull; ';


Expected blank line after variable declarations. (newline-after-var)

stickler-ci · 2018-05-07T23:39:36Z

app/assets/v2/js/pages/new_bounty.js

@@ -137,6 +137,10 @@ $(document).ready(function() {
            githubUsername: metadata.githubUsername,
            address: '' // Fill this in later
          },
+          schemes: {
+            work_scheme: data.work_scheme,
+            application_scheme: data.application_scheme,


Unexpected trailing comma. (comma-dangle)

stickler-ci · 2018-05-07T23:39:36Z

app/assets/v2/js/shared.js

@@ -95,6 +95,12 @@ var sanitizeAPIResults = function(results) {
  return results;
 };

+function ucwords (str) {


Unexpected space before function parentheses. (space-before-function-paren)

stickler-ci · 2018-05-07T23:39:36Z

app/assets/v2/js/shared.js

@@ -95,6 +95,12 @@ var sanitizeAPIResults = function(results) {
  return results;
 };

+function ucwords (str) {
+    return (str + '').replace(/^([a-z])|\s+([a-z])/g, function ($1) {


Expected indentation of 2 spaces but found 4. (indent)
Unexpected space before function parentheses. (space-before-function-paren)

stickler-ci · 2018-05-07T23:39:37Z

app/assets/v2/js/shared.js

@@ -95,6 +95,12 @@ var sanitizeAPIResults = function(results) {
  return results;
 };

+function ucwords (str) {
+    return (str + '').replace(/^([a-z])|\s+([a-z])/g, function ($1) {
+        return $1.toUpperCase();


Expected indentation of 4 spaces but found 8. (indent)

stickler-ci · 2018-05-07T23:39:37Z

app/assets/v2/js/shared.js

+function ucwords (str) {
+    return (str + '').replace(/^([a-z])|\s+([a-z])/g, function ($1) {
+        return $1.toUpperCase();
+    });


Expected indentation of 2 spaces but found 4. (indent)

stickler-ci · 2018-05-07T23:39:37Z

app/dashboard/router.py

@@ -118,7 +119,8 @@ def get_queryset(self):

        # filtering
        for key in ['raw_data', 'experience_level', 'project_length', 'bounty_type', 'bounty_owner_address',
-                    'idx_status', 'network', 'bounty_owner_github_username', 'standard_bounties_id']:
+                    'idx_status', 'network', 'bounty_owner_github_username', 'standard_bounties_id',
+                    'application_scheme', 'work_scheme' ]:


E202 whitespace before ']'

codecov · 2018-05-08T01:14:17Z

Codecov Report

Merging #1098 into master will decrease coverage by 0.36%.
The diff coverage is 16.36%.

@@            Coverage Diff             @@
##           master    #1098      +/-   ##
==========================================
- Coverage   30.64%   30.28%   -0.37%     
==========================================
  Files         124      125       +1     
  Lines        8790     8999     +209     
  Branches     1141     1155      +14     
==========================================
+ Hits         2694     2725      +31     
- Misses       5988     6166     +178     
  Partials      108      108

Impacted Files	Coverage Δ
app/app/urls.py	`94.28% <ø> (ø)`	⬆️
app/dashboard/helpers.py	`26.51% <ø> (ø)`	⬆️
.../management/commands/pending_start_work_actions.py	`0% <0%> (ø)`
app/marketing/mails.py	`12.08% <10%> (-0.31%)`	⬇️
app/dashboard/signals.py	`54.54% <100%> (-3.79%)`	⬇️
app/dashboard/router.py	`34.73% <100%> (ø)`	⬆️
app/retail/emails.py	`21.23% <15.38%> (-1.68%)`	⬇️
app/dashboard/notifications.py	`16.52% <3.03%> (-0.52%)`	⬇️
app/dashboard/views.py	`15.75% <5.17%> (-0.99%)`	⬇️
app/dashboard/models.py	`56.5% <57.14%> (+0.92%)`	⬆️
... and 1 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update c5310da...8e1bf64. Read the comment docs.

stickler-ci · 2018-05-08T01:14:46Z

app/assets/v2/js/pages/bounty_details.js

@@ -514,7 +514,8 @@ var do_actions = function(result) {
  pull_interest_list(result['pk'], function(is_interested) {

    // which actions should we show?
-    var show_start_stop_work = is_still_on_happy_path;
+    var should_block_from_starting_work = !is_interested && result['work_scheme'] == 'traditional' && (result['status'] == 'started' || result['status'] == 'submitted')


Missing semicolon. (semi)

PixelantDesign · 2018-05-08T14:38:32Z

Can we rename Application Scheme ---> Approval Process?

Do we want to encourage work contests?

owocki · 2018-05-08T14:45:46Z

Do we want to encourage work contests?

theres a whole long convo about this at gitcoinco/gitcoinco#9

abitrolly · 2018-05-17T05:08:32Z

Enforcing limit that a person can not start ticket if the person is already doing other ticket.

stickler-ci · 2018-05-20T17:48:52Z

app/assets/v2/js/pages/bounty_details.js

+  },
+  'work_scheme': function(key, val, result) {
+    return [ 'work_scheme', result.work_scheme ];
+    return [ 'bounty_owner_name', result.bounty_owner_name ];


Unreachable code. (no-unreachable)

schemes through start work flow

stickler-ci · 2018-05-20T20:32:04Z

app/assets/v2/js/pages/bounty_details.js

@@ -421,7 +429,8 @@ var show_interest_modal = function() {
  var self = this;

  setTimeout(function() {
-    $.get('/interest/modal?redirect=' + window.location.pathname, function(newHTML) {
+    var url = '/interest/modal?redirect=' + window.location.pathname + "&pk=" + document.result['pk']


Expected blank line after variable declarations. (newline-after-var)
Strings must use singlequote. (quotes)
Missing semicolon. (semi)

stickler-ci · 2018-05-20T20:32:05Z

app/dashboard/notifications.py

@@ -392,21 +392,39 @@ def build_github_notification(bounty, event_name, profile_pairs=None):
              "* Questions? Checkout <a href='https://gitcoin.co/help'>Gitcoin Help</a> or <a href='https://gitcoin.co/slack'>Gitcoin Slack</a>\n * " \
              f"${amount_open_work} more funded OSS Work available on the [Gitcoin Issue Explorer](https://gitcoin.co/explorer)\n"
    elif event_name == 'work_started':
+        interested = bounty.interested.all()
+        interestd_plural = "s" if interested.count() != 0 else ""


F841 local variable 'interestd_plural' is assigned to but never used

stickler-ci · 2018-05-20T20:32:05Z

app/dashboard/notifications.py

-        msg = f"{status_header}__Work has been started__.\n{profiles} has committed to working on this project to be " \
-              f"completed {from_now}.\n\n"
+        started_work = bounty.interested.filter(pending=False).all()
+        pending_approval = bounty.interested.filter(pending=True).all()


F841 local variable 'pending_approval' is assigned to but never used

stickler-ci · 2018-05-20T20:32:05Z

app/dashboard/notifications.py

+
+            issue_message = interest.issue_message.strip()
+            if issue_message:
+                msg += f"{bounty_owner_clear} they have the following comments/questions for you:\n\n```{issue_message}```"


E501 line too long (123 > 120 characters)

stickler-ci · 2018-05-20T20:32:05Z

app/dashboard/views.py

@@ -190,14 +205,14 @@ def new_interest(request, bounty_id):

    if profile.has_been_removed_by_staff():
        return JsonResponse({
-            'error': _('Because a staff member has had to remove you from a bounty in the past, you are unable to start more work at this time. Please contact support.'),
+            'error': _('Because a staff member has had to remove you from a bounty in the past, you are unable to start more work at this time. Please leave a message on slack if you feel this message is in error.'),


E501 line too long (216 > 120 characters)

stickler-ci · 2018-05-20T20:32:05Z

app/dashboard/views.py

+        if is_funder or is_staff:
+            interests = bounty.interested.filter(pending=True, profile__handle=worker)
+            if not interests.exists():
+                messages.warning(request, _('This worker does not exist or is not in a pending state. Please check your link and try again.'))


E501 line too long (142 > 120 characters)

stickler-ci · 2018-05-20T20:32:05Z

app/dashboard/views.py

+                interest.pending = False
+                interest.save()
+
+                # TODO: send an email when 


W291 trailing whitespace

stickler-ci · 2018-05-20T20:32:05Z

app/dashboard/views.py

+                maybe_market_to_slack(bounty, 'worker_approved')
+                maybe_market_to_user_slack(bounty, 'worker_approved')
+                maybe_market_to_twitter(bounty, 'worker_approved')
+


W293 blank line contains whitespace

stickler-ci · 2018-05-20T20:32:05Z

app/dashboard/views.py

+                maybe_market_to_twitter(bounty, 'worker_approved')
+
+
+            else:


E303 too many blank lines (2)

owocki · 2018-05-20T20:32:11Z

mocked up github issue for starting work in the new work schemes paradigm http://bits.owocki.com/17161E2M1x18/Screen%20Shot%202018-05-20%20at%202.31.01%20PM.png

owocki · 2018-05-21T15:21:43Z

example gitcoinbot comment thread owocki/pytrader#96

mbeacom · 2018-05-21T15:41:54Z

Initial thoughts:

The copy: @owocki they have the following comments/questions for you: seems repetitive when applied to all users starting work.

Maybe we could restructure the comment to have less repetitive copy with something like:

Option 1

Issue Status: 1. Open 2. Started 3. Submitted 4. Done

Work has been started.

@owocki These users each claimed they can complete the work within 12 months from now. Please review their questions below:

gitcointestuser has applied to start work (Funders only: approve worker | reject worker).
- Q: foo the bar. lol 123
gitcoinbot has been approved to start work.
- Q: i am the walrus
joesnuffy has been approved to start work.
- Q: How do I get started?

Option 2

Issue Status: 1. Open 2. Started 3. Submitted 4. Done

Work has been started.

These users each claimed they can complete the work within 12 months from now. Please review their questions below:

Start Work

Awaiting Approval

gitcointestuser (Funders only: approve worker | reject worker).
- Q: foo the bar. lol 123

Approved

gitcoinbot
- Q: i am the walrus
joesnuffy
- Q: How do I get started?

Option 3

Issue Status: 1. Open 2. Started 3. Submitted 4. Done

Work has been started.

These users each claimed they can complete the work within 12 months from now:

gitcointestuser has applied to start work (Funders only: approve worker | reject worker).
gitcoinbot has been approved to start work.
joesnuffy has been approved to start work.

Questions:

@owocki Please review the following questions:

foo the bar. lol 123
i am the walrus
How do I get started?

stickler-ci · 2018-05-22T17:52:21Z

app/dashboard/helpers.py

@@ -414,7 +414,7 @@ def create_new_bounty(old_bounties, bounty_payload, bounty_details, bounty_id):
    # Currently we are only considering the latest fulfillment.  Std bounties supports multiple.
    # If any of the fulfillments have been accepted, the bounty is now accepted and complete.
    accepted = any([fulfillment.get('accepted') for fulfillment in fulfillments])
-
+    


W293 blank line contains whitespace

stickler-ci · 2018-05-22T17:52:21Z

app/dashboard/views.py

@@ -178,6 +186,13 @@ def new_interest(request, bounty_id):
    except Bounty.DoesNotExist:
        raise Http404

+    is_too_many_already_started = bounty.work_scheme == 'traditional' and bounty.interested.filter(pending=False).count() > 0


E501 line too long (125 > 120 characters)

We could do:

is_too_many_already_started = bounty.work_scheme == 'traditional' and bounty.interested.filter(pending=False).exists()
to avoid the COUNT().

Also, can we add Bounty.SCHEME_TYPES and the individual scheme types, so: bounty.work_scheme == 'traditional' would become: bounty.work_scheme == Bounty.SCHEME_TRADITIONAL or something like that.

Bounty.work_scheme would be modified to include choices=SCHEME_TYPES

owocki · 2018-05-22T20:55:42Z

@mbeacom i like option number 1

PixelantDesign · 2018-05-23T02:26:26Z

Not to bloat up the work schemes, but I wonder if it might makes sense to allow for a progressive input under Work Scheme: Traditional so that the funder can tag a contributor that they're reserving the issue for.

Example: Reserved for @owocki

owocki · 2018-05-23T02:30:31Z

i like the idea.. can we v2 it?

thelostone-mc · 2018-05-23T05:47:46Z

@owocki @mbeacom could we consider option 2 over 1.
Sole reason being : It's neat segregated into two buckets and make things clear ! (No repetitive text )

Issue Status: 1. Open 2. Started 3. Submitted 4. Done

Work has been started.

@owocki These users each claimed they can complete the work within 12 months from now. Please review their questions below:

Awaiting Approval (Only funder can approve / reject worker)

gitcointestuser (approve / reject) : foo the bar. lol 123

Approved

gitcoinbot : i am the walrus
joesnuffy : How do I get started?

thelostone-mc

LGTM

stickler-ci · 2018-06-04T16:42:57Z

app/assets/v2/js/pages/bounty_details.js

@@ -136,6 +138,15 @@ var callbacks = {
  'bounty_owner_name': function(key, val, result) {
    return [ 'bounty_owner_name', result.bounty_owner_name ];
  },
+  'permission_type': function(key, val, result) {
+    if(val == 'approval'){


Expected space(s) after "if". (keyword-spacing)
Missing space before opening brace. (space-before-blocks)

mbeacom · 2018-06-04T16:46:11Z

app/app/urls.py

@@ -238,6 +238,14 @@
    url(r'^_administration/email/start_work_expired$', retail.emails.start_work_expired, name='start_work_expired'),
    re_path(r'^_administration/email/gdpr_reconsent$', retail.emails.gdpr_reconsent, name='gdpr_reconsent'),
    url(r'^_administration/email/new_tip/resend$', retail.emails.resend_new_tip, name='resend_new_tip'),
+    url(r'^_administration/process_accesscode_request/(.*)$', tdi.views.process_accesscode_request, name='process_accesscode_request'),


make fix-yapf or make-fix

mbeacom · 2018-06-04T16:52:00Z

app/dashboard/views.py

@@ -133,7 +138,10 @@ def gh_login(request):

 def get_interest_modal(request):

+    bounty = Bounty.objects.get(pk=request.GET.get("pk"))


Should we catch if request.GET.get('pk') is not present?

it should always be present per the JS tho?

mbeacom · 2018-06-04T16:54:46Z

app/retail/templates/emails/start_work_applicant_about_to_expire.html

+
+<h1>{% trans "24 Hrs to Approve" %}</h1>
+<div style="text-align: left! important">
+    <p>


Can we switch this to two-space indentation for all of the new html templates throughout?

let me see how to auto lint this

stickler-ci · 2018-06-04T16:57:30Z

app/dashboard/notifications.py

+            msg = f"{status_header}__Workers have applied to start work__.\n\n"
+
+        msg += f"\nThese users each claimed they can complete the work by {from_now}. " \
+                "Please review their questions below:\n\n"


E127 continuation line over-indented for visual indent

…into kevin/application_schemes

stickler-ci · 2018-06-04T17:13:01Z

app/dashboard/models.py

@@ -934,12 +983,21 @@ class Interest(models.Model):
    """Define relationship for profiles expressing interest on a bounty."""

    profile = models.ForeignKey('dashboard.Profile', related_name='interested', on_delete=models.CASCADE)
-    created = models.DateTimeField(auto_now_add=True, blank=True, null=True)
+    created = models.DateTimeField(auto_now_add=True, blank=True, null=True)    


W291 trailing whitespace

…into kevin/application_schemes

This reverts commit e8e3041.

… the denomination dropdown

…into kevin/application_schemes

stickler-ci · 2018-06-04T19:11:25Z

app/assets/v2/js/pages/new_bounty.js

  $('.js-select2').each(function() {
    $(this).select2();
  });
+  //removes tooltip


Expected space or tab after '//' in comment. (spaced-comment)

stickler-ci · 2018-06-04T19:11:25Z

app/assets/v2/js/pages/new_bounty.js

  $('.js-select2').each(function() {
    $(this).select2();
  });
+  //removes tooltip
+  $('select').on('change', function (evt) {


Unexpected space before function parentheses. (space-before-function-paren)

stickler-ci · 2018-06-04T19:11:25Z

app/assets/v2/js/pages/new_bounty.js

  $('.js-select2').each(function() {
    $(this).select2();
  });
+  //removes tooltip
+  $('select').on('change', function (evt) {
+      $('.select2-selection__rendered').removeAttr('title');


Expected indentation of 4 spaces but found 6. (indent)

stickler-ci · 2018-06-04T19:11:25Z

app/assets/v2/js/pages/new_bounty.js

+  $('select').on('change', function (evt) {
+      $('.select2-selection__rendered').removeAttr('title');
+  });
+  //removes search field in all but the 'denomination' dropdown


Expected space or tab after '//' in comment. (spaced-comment)

stickler-ci · 2018-06-04T19:11:25Z

app/assets/v2/js/pages/new_bounty.js

+      $('.select2-selection__rendered').removeAttr('title');
+  });
+  //removes search field in all but the 'denomination' dropdown
+  $('.select2-container').click(function(){


Missing space before opening brace. (space-before-blocks)

stickler-ci · 2018-06-04T19:11:25Z

app/assets/v2/js/pages/new_bounty.js

+  });
+  //removes search field in all but the 'denomination' dropdown
+  $('.select2-container').click(function(){
+      $('.select2-container .select2-search__field').remove();


Expected indentation of 4 spaces but found 6. (indent)

stickler-ci · 2018-06-04T19:11:26Z

app/assets/v2/js/pages/new_bounty.js

+  $('.select2-container').click(function(){
+      $('.select2-container .select2-search__field').remove();
+  });
+  //denomination field


Expected space or tab after '//' in comment. (spaced-comment)

owocki added 2 commits May 7, 2018 17:36

work schemes

39c5bc3

work schemes

958af75

stickler-ci reviewed May 7, 2018

View reviewed changes

enforce limits on # ppl starting work

d17cbd0

stickler-ci reviewed May 8, 2018

View reviewed changes

work scheme on profile

0f2bf25

mbeacom added in progress labels May 8, 2018

owocki mentioned this pull request May 16, 2018

Started work / Stop Work History #1037

Closed

owocki added 2 commits May 20, 2018 11:46

small copy change

d47279c

Merge branch 'master' into kevin/application_schemes

b026b09

stickler-ci reviewed May 20, 2018

View reviewed changes

thread the application

3a78bc2

schemes through start work flow

stickler-ci reviewed May 20, 2018

View reviewed changes

owocki added 2 commits May 20, 2018 14:32

make fix

9935daf

syntax fixes vai make fix

47d23d4

owocki added 2 commits May 21, 2018 10:18

todos

6d7f957

quick update

0754839

stickler-ci reviewed May 22, 2018

View reviewed changes

thelostone-mc previously approved these changes Jun 4, 2018

View reviewed changes

dupe msgs

97fbeff

owocki dismissed thelostone-mc’s stale review via 97fbeff June 4, 2018 16:23

copy update

000a522

stickler-ci reviewed Jun 4, 2018

View reviewed changes

copy

02a1cf3

mbeacom reviewed Jun 4, 2018

View reviewed changes

Stickler

e7c0d12

stickler-ci reviewed Jun 4, 2018

View reviewed changes

mbeacom and others added 5 commits June 4, 2018 13:00

Stickler

f92d7c2

bugfxi

74f7366

Merge branch 'kevin/application_schemes' of github.com:gitcoinco/web …

2e2df39

…into kevin/application_schemes

acceptance date

e250e8a

acceptance date

403b5ee

stickler-ci reviewed Jun 4, 2018

View reviewed changes

owocki and others added 10 commits June 4, 2018 11:18

html tab sizing

fd6d0c3

Remove merge migration and reorder migrations

437e154

show dibs still for traditional bounties

2d9a51c

Merge branch 'kevin/application_schemes' of github.com:gitcoinco/web …

b10d293

…into kevin/application_schemes

alisa feedbak -- select forms

e8e3041

Revert "alisa feedbak -- select forms"

9a9486b

This reverts commit e8e3041.

Add pending copy to test interest assertion

d3b0ebe

Trim whitespace

7a7525d

removes tooltip from all select2, also removes searchbar from all but…

e1fdfea

… the denomination dropdown

Merge branch 'kevin/application_schemes' of github.com:gitcoinco/web …

1694d5a

…into kevin/application_schemes

stickler-ci reviewed Jun 4, 2018

View reviewed changes

Stickler

8e1bf64

owocki merged commit 8e1bf64 into master Jun 4, 2018

ghost removed the in progress label Jun 4, 2018

mbeacom deleted the kevin/application_schemes branch June 4, 2018 20:03

		@@ -133,7 +138,10 @@ def gh_login(request):

		def get_interest_modal(request):

		bounty = Bounty.objects.get(pk=request.GET.get("pk"))

project_types (formerly work schemes) #1098

project_types (formerly work schemes) #1098

Conversation

owocki commented May 7, 2018 • edited Loading

Description

to release

Checklist

Affected core subsystem(s)

Testing

Refers/Fixes

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

codecov bot commented May 8, 2018 • edited Loading

Codecov Report

Choose a reason for hiding this comment

PixelantDesign commented May 8, 2018

owocki commented May 8, 2018

abitrolly commented May 17, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

owocki commented May 20, 2018

owocki commented May 21, 2018

mbeacom commented May 21, 2018 • edited Loading

Option 1

Option 2

Start Work

Awaiting Approval

Approved

Option 3

Questions:

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mbeacom May 22, 2018 • edited Loading

Choose a reason for hiding this comment

owocki commented May 22, 2018

PixelantDesign commented May 23, 2018 • edited Loading

owocki commented May 23, 2018

thelostone-mc commented May 23, 2018 • edited Loading

thelostone-mc left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

owocki commented May 7, 2018 •

edited

Loading

codecov bot commented May 8, 2018 •

edited

Loading

mbeacom commented May 21, 2018 •

edited

Loading

mbeacom May 22, 2018 •

edited

Loading

PixelantDesign commented May 23, 2018 •

edited

Loading

thelostone-mc commented May 23, 2018 •

edited

Loading