Group tasks ui picked (#7996)
* Added initial group tasks ui * Changed group compnent directory * Added group task checklist support * Added checklist support to ui * Fixed delete tags route * Added checklist routes to support new group tasks * Added assign user tag input * Added new group members autocomplete directive * Linked assign ui to api * Added styles * Limited tag use * Fixed line endings * Updated to new file structure * Fixed failing task tests * Updatd with new checklist logic and fixed columns * Added purchased info to group and prevented non purchased group from seeing new group tasks * Updated add task function * Added userid check back to tag routes * Marked tag tests as pending * Added comments to pending tests * Added back routes accidently deleted * Added locale strings * Other clarity fixes * Moved common task function to task service * Removed files from manifest * Fixed naming collision and remove logic * Removed group get tasks until live * Fixed test to check update task. Removed extra removeTask call. Synced updated checklists. Added purchased to noset * Fixed delete group task
This commit is contained in:
committed by
Matteo Pagliazzi
parent
6a82206f81
commit
285041cdee
@@ -147,7 +147,20 @@ a.pull-right.gem-wallet(ng-if='group.type!="party"', popover-trigger='mouseenter
|
||||
h3.popover-title {{group.leader.profile.name}}
|
||||
.popover-content
|
||||
markdown(text='group._editing ? groupCopy.leaderMessage : group.leaderMessage')
|
||||
div(ng-controller='ChatCtrl')
|
||||
|
||||
ul.options-menu(ng-init="groupPane = 'chat'", ng-show="group.purchased.active")
|
||||
li
|
||||
a(ng-click="groupPane = 'chat'")
|
||||
| Chat
|
||||
li
|
||||
a(ng-click="groupPane = 'tasks'")
|
||||
| Tasks
|
||||
|
||||
|
||||
.tab-content
|
||||
.tab-pane.active
|
||||
|
||||
div(ng-controller='ChatCtrl', ng-show="groupPane == 'chat'")
|
||||
.alert.alert-info.alert-sm(ng-if='group.memberCount > Shared.constants.LARGE_GROUP_COUNT_MESSAGE_CUTOFF')=env.t('largeGroupNote')
|
||||
h3=env.t('chat')
|
||||
include ./chat-box
|
||||
@@ -155,3 +168,5 @@ a.pull-right.gem-wallet(ng-if='group.type!="party"', popover-trigger='mouseenter
|
||||
+chatMessages()
|
||||
h4(ng-if='group.chat.length < 1 && group.type === "party"')=env.t('partyChatEmpty')
|
||||
h4(ng-if='group.chat.length < 1 && group.type === "guild"')=env.t('guildChatEmpty')
|
||||
|
||||
group-tasks(ng-show="groupPane == 'tasks'")
|
||||
|
||||
@@ -0,0 +1,2 @@
|
||||
script(type='text/ng-template', id='partials/groups.members.autocomplete.html')
|
||||
div#taggle.input.textarea.clearfix
|
||||
@@ -0,0 +1,4 @@
|
||||
script(type='text/ng-template', id='partials/groups.tasks.actions.html')
|
||||
div(ng-if="group.leader._id === user._id", class="col-md-12")
|
||||
strong=env.t('assignTask')
|
||||
group-members-autocomplete(ng-model="assignedMembers")
|
||||
@@ -0,0 +1,5 @@
|
||||
include ./group-tasks-actions
|
||||
include ./group-members-autocomplete
|
||||
|
||||
script(type='text/ng-template', id='partials/groups.tasks.html')
|
||||
habitrpg-tasks(main=false)
|
||||
@@ -6,6 +6,7 @@ include ./hall
|
||||
include ./quests/index
|
||||
include ./chat-message
|
||||
include ./party
|
||||
include ./groups/group-tasks
|
||||
|
||||
script(type='text/ng-template', id='partials/options.social.inbox.html')
|
||||
.options-blurbmenu
|
||||
|
||||
@@ -9,6 +9,9 @@ div(ng-if='::task.type!="reward"')
|
||||
a.hint(href='http://habitica.wikia.com/wiki/Task_Alias', target='_blank', popover-trigger='mouseenter', popover="{{::env.t('taskAliasPopover')}} {{::task._edit.alias ? '\n\n\' + env.t('taskAliasPopoverWarning') : ''}}")=env.t('taskAlias')
|
||||
input.form-control(ng-model='task._edit.alias' type='text' placeholder=env.t('taskAliasPlaceholder'))
|
||||
|
||||
fieldset.option-group.advanced-option(ng-show="task._edit._advanced")
|
||||
group-tasks-actions(ng-if="obj.type == 'guild'", task='task', group='obj')
|
||||
|
||||
div(ng-show='task._edit._advanced')
|
||||
div(ng-if='::task.type == "daily"')
|
||||
.form-group
|
||||
|
||||
@@ -6,7 +6,7 @@ include ./task_view/mixins
|
||||
script(id='templates/habitrpg-tasks.html', type="text/ng-template")
|
||||
.tasks-lists.container-fluid
|
||||
.row
|
||||
.col-md-3.col-sm-6(ng-repeat='list in lists', ng-class='::{ "rewards-module": list.type==="reward", "new-row-md": list.type==="todo" }')
|
||||
.col-md-3.col-sm-6(ng-repeat='list in lists', ng-class='::{ "rewards-module": list.type==="reward", "new-row-md": list.type==="todo", "col-md-2": obj.type }')
|
||||
.task-column(class='{{::list.type}}s')
|
||||
|
||||
include ./task_view/graph
|
||||
|
||||
Reference in New Issue
Block a user