Skip to content
Snippets Groups Projects

Pietro/shifts family

Closed Pietro/shifts family
pietro/shiftsFamily into master
1 open thread
Closed
pietrorequested to merge
pietro/shiftsFamily into master
1 open thread

It all the data, it's not clear we need to group shifts. It might be even worth it to change the granularity and a "shift" (title, description, etc) with an array of dates. Similar to a project, but presented differently...

Edited by pietro

Merge request reports

Approval is optional

Closed by pietropietro Feb 14, 2018 (Feb 14, 2018 8:22pm UTC)

Merge details

  • The changes were not merged into master.

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
client/signups/team.html
26 {{#each group in family.groups}}
27 {{#each shift in group.shifts }}
28 <tr class="shift {{family.class}} collapse" data-id="{{shift._id}}">
29 <td>
30 {{#if $eq shift.priority "essential"}}
31 <div class="text-danger">{{fa "exclamation-circle"}}</div>
32 {{/if}}
33 </td>
34 <td>{{> shiftDateInline shift}}</td>
35 <!-- <td>
36 {{shift.title}}
37 {{#if ($eq shift.policy 'public')}}{{fa 'globe'}}{{/if}}
38 {{#if ($eq shift.policy 'private')}}{{fa 'user-secret'}}{{/if}}
39 {{#if ($eq shift.policy 'requireApproval')}}{{fa 'lock'}}{{/if}}
40 </td> -->
41 <td class="pull-rigth">
  • Rich
    Rich @piemonkey
    Maintainer

    It might be even worth it to change the granularity and a "shift" (title, description, etc) with an array of dates.

    This is what I was referring to in Riot, it seems we should either change this or add another entity, as it's how everyone thinks of shifts in real life.

  • Rich approved this merge request

    approved this merge request

  • pietro
    pietro @abate
    Author Owner

    I'll think about this and how it will impact the rest of the code ...

  • pietro unmarked as a Work In Progress

    unmarked as a Work In Progress

  • pietro added 6 commits

    added 6 commits

    Compare with previous version

  • pietro closed

    closed

    • Please register or sign in to reply