Skip to content

Commit

Permalink
Drag: Task drag and drop
Browse files Browse the repository at this point in the history
  • Loading branch information
@asaquzzaman
asaquzzaman committed Dec 19, 2018
1 parent d0bcbcb commit 8705548
Show file tree
Hide file tree
Showing 5 changed files with 115 additions and 45 deletions.
2 changes: 1 addition & 1 deletion core/Promotions/Offers.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public function promotional_offer() {
return;
}

if ( date( 'Y-m-d', current_time( 'timestamp') ) > '2018-12-30' ) {
if ( date( 'Y-m-d', current_time( 'timestamp') ) > '2018-12-31' ) {
return;
}

Expand Down
7 changes: 5 additions & 2 deletions languages/wedevs-project-manager.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,18 @@
__( 'Activity', 'wedevs-project-manager' ),
__( 'Are you sure you want to delete this milestones?', 'wedevs-project-manager' ),
__( 'Are you sure to delete this comment?', 'wedevs-project-manager' ),
__( 'Project title is required!', 'wedevs-project-manager' ),
__( 'Are you sure!', 'wedevs-project-manager' ),
__( 'Project Actions', 'wedevs-project-manager' ),
__( 'Name of the project', 'wedevs-project-manager' ),
__( 'Some details about the project (optional)', 'wedevs-project-manager' ),
__( 'Type 3 or more characters to search users...', 'wedevs-project-manager' ),
__( 'Create a new user', 'wedevs-project-manager' ),
__( 'Add New Project', 'wedevs-project-manager' ),
__( 'Update Project', 'wedevs-project-manager' ),
__( 'Project title is required!', 'wedevs-project-manager' ),
__( 'Client', 'wedevs-project-manager' ),
__( 'Create User', 'wedevs-project-manager' ),
__( 'Create', 'wedevs-project-manager' ),
__( 'Any', 'wedevs-project-manager' ),
__( 'Over Due', 'wedevs-project-manager' ),
__( 'Today', 'wedevs-project-manager' ),
Expand Down Expand Up @@ -113,7 +116,7 @@
__( 'New Task List', 'wedevs-project-manager' ),
__( '- Milestone -', 'wedevs-project-manager' ),
__( 'Add new task', 'wedevs-project-manager' ),
__( 'Task Title: ', 'wedevs-project-manager' ),
__( 'Task: ', 'wedevs-project-manager' ),
__( 'Search Lists', 'wedevs-project-manager' ),
__( 'Move Task', 'wedevs-project-manager' ),
__( 'Make Public', 'wedevs-project-manager' ),
Expand Down
140 changes: 104 additions & 36 deletions languages/wedevs-project-manager.pot
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WP Project Manager 2.0.8\n"
"Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/cpm\n"
"POT-Creation-Date: 2018-12-13 09:11:26+00:00\n"
"POT-Creation-Date: 2018-12-19 08:26:20+00:00\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
Expand All @@ -20,21 +20,18 @@ msgstr ""
#: core/Notifications/Emails/New_Comment_Notification.php:55
#: core/Notifications/Emails/Update_Comment_Notification.php:54
#: views/emails/html/new-message.php:39 views/emails/html/update-message.php:39
#: views/emails/mention.php:13
msgid "Message"
msgstr ""

#: core/Notifications/Emails/New_Comment_Notification.php:60
#: core/Notifications/Emails/Update_Comment_Notification.php:57
#: views/emails/mention.php:20
msgid "Task List"
msgstr ""

#: core/Notifications/Emails/New_Comment_Notification.php:65
#: core/Notifications/Emails/Update_Comment_Notification.php:60
#: views/assets/js/pm.js:9
#: views/assets/src/components/project-overview/directive.js:10
#: views/emails/mention.php:25
msgid "Task"
msgstr ""

Expand Down Expand Up @@ -97,21 +94,85 @@ msgstr ""
msgid "You have no permission to create project."
msgstr ""

#: core/Upgrades/Upgrade.php:143
#: core/Promotions/Offers.php:43
msgid ""
"<strong>WP Project Manager Data Update Required</strong> &#8211; Please "
"click the button below to update to the latest version."
"<p>In this Christmas, stay on top of budgets. Spend <strong>30%% "
"LESS</strong> on <strong>WP Project Manager Pro</strong> and increase "
"productivity for you and your organization. [Limited time ⏳😎]</p> <p><a "
"target=\"_blank\" class=\"button button-primary\" href=\"%s\">Grab The "
"Deal</a></p>"
msgstr ""

#: core/Promotions/Offers.php:79 core/Promotions/Wedevs_Promotion.php:187
msgid "You have no permission to do that"
msgstr ""

#: core/Promotions/Offers.php:83 core/Promotions/Wedevs_Promotion.php:191
msgid "Invalid nonce"
msgstr ""

#: core/Promotions/Promotions.php:42
msgid "Visualize all the task progress and get full insights"
msgstr ""

#: core/Promotions/Promotions.php:43
msgid ""
"Leverage the Gantt chart feature in your WP Project Manager Pro. Get exact "
"progress illustration of all tasks, and never miss a deadline."
msgstr ""

#: core/Promotions/Promotions.php:50
msgid "Get more organized and more efficient in Kanban Style"
msgstr ""

#: core/Promotions/Promotions.php:51
msgid ""
"Utilize the popular Kanban method and improve your workflow significantly. "
"Segment your tasks into a different category and utilize the most of "
"project management tools."
msgstr ""

#: core/Promotions/Promotions.php:58
msgid "Time wastage is not an option!"
msgstr ""

#: core/Promotions/Promotions.php:59
msgid ""
"Time is money! So make the most out of it. Use the advanced time tracker "
"extension to get accurate insights about time management."
msgstr ""

#: core/Promotions/Promotions.php:66
msgid "Small things bring great achievements!"
msgstr ""

#: core/Promotions/Promotions.php:67
msgid ""
"Breakdown your main task into smaller parts and set milestones for them. "
"Complete big tasks successfully easier than ever."
msgstr ""

#: core/Promotions/Wedevs_Promotion.php:82
msgid "Learn More &rarr;"
msgstr ""

#: core/Upgrades/Upgrade.php:146
msgid "Run the Update"
msgid "WP Project Manager Data Update Required"
msgstr ""

#: core/Upgrades/Upgrade.php:147
msgid "&#8211; Please click the button below to update to the latest version."
msgstr ""

#: core/Upgrades/Upgrade.php:151
msgid "Run the Update"
msgstr ""

#: core/Upgrades/Upgrade.php:152
msgid "Read More"
msgstr ""

#: core/Upgrades/Upgrade.php:155
#: core/Upgrades/Upgrade.php:160
msgid ""
"It is strongly recommended that you backup your database before proceeding. "
"Are you sure you wish to run the updater now?"
Expand All @@ -134,39 +195,39 @@ msgstr ""
msgid "Allowed Files"
msgstr ""

#: core/WP/Frontend.php:144
#: core/WP/Frontend.php:146
msgid "Every %d Minutes PM schedule"
msgstr ""

#: core/WP/Frontend.php:171
#: core/WP/Frontend.php:175
msgid "<h2>WP Project Manager Pro required version 2.0 or above.</span></h2>"
msgstr ""

#: core/WP/Frontend.php:172
#: core/WP/Frontend.php:176
msgid "<p>To migrate version 2.0, Please read mmigration docs </p>"
msgstr ""

#: core/WP/Frontend.php:181
#: core/WP/Frontend.php:185
msgid "Read Docs"
msgstr ""

#: core/WP/Frontend.php:288
#: core/WP/Frontend.php:292
msgid "Get Pro"
msgstr ""

#: core/WP/Frontend.php:291 core/WP/Menu.php:36
#: core/WP/Frontend.php:295 core/WP/Menu.php:36
msgid "Settings"
msgstr ""

#: core/WP/Frontend.php:292
#: core/WP/Frontend.php:296
msgid "Documentation"
msgstr ""

#: core/WP/Frontend.php:337 core/WP/Frontend.php:350
#: core/WP/Frontend.php:340 core/WP/Frontend.php:353
msgid "Create New Task"
msgstr ""

#: core/WP/Frontend.php:366
#: core/WP/Frontend.php:369
msgid "Jump to a project"
msgstr ""

Expand Down Expand Up @@ -270,10 +331,6 @@ msgstr ""
msgid "file not found"
msgstr ""

#: src/Milestone/Controllers/Milestone_Controller.php:58
msgid "this is mishu"
msgstr ""

#: src/Milestone/Validators/Create_Milestone.php:10
#: src/Milestone/Validators/Update_Milestone.php:10
msgid "Milestone title is required."
Expand Down Expand Up @@ -839,6 +896,7 @@ msgstr ""
#: views/assets/src/components/project-discussions/new-discuss-form.vue:32
#: views/assets/src/components/project-lists/project-create-form.vue:60
#: views/assets/src/components/project-milestones/new-milestone-form.vue:18
#: views/assets/src/components/project-overview/addNewUser.vue:52
#: views/assets/src/components/project-task-lists/list-comment-form.vue:15
#: views/assets/src/components/project-task-lists/lists.vue:197
#: views/assets/src/components/project-task-lists/new-task-list-form.vue:31
Expand All @@ -861,7 +919,7 @@ msgid "Are you sure?"
msgstr ""

#: views/assets/js/library.js:1 views/assets/js/pm.js:1
#: views/assets/src/helpers/mixin/mixin.js:812
#: views/assets/src/helpers/mixin/mixin.js:810
#: views/assets/vendor/mixin/mixin.js:636
msgid "Are you sure to delete this project?"
msgstr ""
Expand Down Expand Up @@ -1082,6 +1140,17 @@ msgstr ""
msgid "Are you sure to delete this comment?"
msgstr ""

#: views/assets/js/pm.js:1
#: views/assets/src/components/project-lists/project-create-form.vue:225
#: views/assets/src/components/project-overview/mixin.js:26
msgid "Project title is required!"
msgstr ""

#: views/assets/js/pm.js:1
#: views/assets/src/components/project-overview/mixin.js:80
msgid "Are you sure!"
msgstr ""

#: views/assets/js/pm.js:1 views/assets/src/components/common/header.vue:327
msgid "Project Actions"
msgstr ""
Expand Down Expand Up @@ -1119,15 +1188,20 @@ msgid "Update Project"
msgstr ""

#: views/assets/js/pm.js:1
#: views/assets/src/components/project-lists/project-create-form.vue:219
msgid "Project title is required!"
#: views/assets/src/components/project-lists/project-create-form.vue:124
msgid "Client"
msgstr ""

#: views/assets/js/pm.js:1
#: views/assets/src/components/project-lists/project-new-user-form.vue:43
msgid "Create User"
msgstr ""

#: views/assets/js/pm.js:1
#: views/assets/src/components/project-overview/addNewUser.vue:51
msgid "Create"
msgstr ""

#: views/assets/js/pm.js:1
#: views/assets/src/components/project-task-lists/lists.vue:1050
#: views/assets/src/components/project-task-lists/lists.vue:1054
Expand Down Expand Up @@ -1391,21 +1465,25 @@ msgstr ""

#: views/assets/js/pm.js:9
#: views/assets/src/components/project-lists/project-new-user-form.vue:7
#: views/assets/src/components/project-overview/addNewUser.vue:7
msgid "Username"
msgstr ""

#: views/assets/js/pm.js:9
#: views/assets/src/components/project-lists/project-new-user-form.vue:12
#: views/assets/src/components/project-overview/addNewUser.vue:12
msgid "First Name"
msgstr ""

#: views/assets/js/pm.js:9
#: views/assets/src/components/project-lists/project-new-user-form.vue:17
#: views/assets/src/components/project-overview/addNewUser.vue:17
msgid "Last Name"
msgstr ""

#: views/assets/js/pm.js:9
#: views/assets/src/components/project-lists/project-new-user-form.vue:22
#: views/assets/src/components/project-overview/addNewUser.vue:22
msgid "Email"
msgstr ""

Expand Down Expand Up @@ -1499,7 +1577,7 @@ msgstr ""

#: views/assets/js/pm.js:9
#: views/assets/src/components/project-task-lists/move-task.vue:12
msgid "Task Title: "
msgid "Task: "
msgstr ""

#: views/assets/js/pm.js:9
Expand Down Expand Up @@ -1988,7 +2066,6 @@ msgid "On"
msgstr ""

#: views/emails/html/new-comment.php:38 views/emails/html/update-comment.php:38
#: views/emails/mention.php:47
msgid "View Comment"
msgstr ""

Expand All @@ -2013,7 +2090,6 @@ msgid "Project Created By"
msgstr ""

#: views/emails/html/new-project.php:23 views/emails/html/update-project.php:22
#: views/emails/mention.php:37
msgid "Hello"
msgstr ""

Expand Down Expand Up @@ -2057,14 +2133,6 @@ msgstr ""
msgid "Updated By"
msgstr ""

#: views/emails/mention.php:39
msgid "You are mentioned in a comment by"
msgstr ""

#: views/emails/mention.php:41
msgid "Please click the link bellow to view the comment."
msgstr ""

#. Plugin Name of the plugin/theme
msgid "WP Project Manager"
msgstr ""
Expand Down
8 changes: 4 additions & 4 deletions views/assets/src/components/project-lists/project-summary.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -131,16 +131,16 @@
<img class="pm-img-circle" :src="user.avatar_url" :alt="user.display_name">
</li> -->

<li v-for="(user, key) in project.assignees.data" v-if="key <= 6" :key="key" class="pm-has-tooltip">
<li v-for="(user, key) in project.assignees.data" v-if="key <= 5" :key="key" class="pm-has-tooltip">
<img class="pm-img-circle" :src="user.avatar_url" :alt="user.display_name">
<span class="pm-tooltip-label">{{ user.display_name }}</span>
</li>

<!-- more user button and their markup -->
<li v-if="project.assignees.data.length > 7" class="pm-more-users pm-has-dropdown">
<a :data-project_id="project.id" @click.prevent="showMoreUser(project)" href="#" class="pm-dropdown-trigger">{{ project.assignees.data.length - 7 }}+</a>
<li v-if="project.assignees.data.length > 6" class="pm-more-users pm-has-dropdown">
<a :data-project_id="project.id" @click.prevent="showMoreUser(project)" href="#" class="pm-dropdown-trigger">{{ project.assignees.data.length - 6 }}+</a>
<ul :class="'pm-dropdown-menu '+ pmDropDownOpen(project)">
<li v-for="(user, key) in project.assignees.data" v-if="key > 6" :key="key" class="pm-has-tooltip">
<li v-for="(user, key) in project.assignees.data" v-if="key > 5" :key="key" class="pm-has-tooltip">
<img class="pm-img-circle" :src="user.avatar_url" :alt="user.display_name">
<span class="pm-tooltip-label">{{ user.display_name }}</span>
</li>
Expand Down
3 changes: 1 addition & 2 deletions views/assets/src/components/project-task-lists/list-tasks.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -436,8 +436,7 @@
}
}
.incomplete-task-ul {
padding-left: 0 !important;
padding-right: 0 !important;
padding: 1px 0 !important;
}
.complete-task-ul {
Expand Down

0 comments on commit 8705548

Please sign in to comment.