nextcloud · juliusknorr · Oct 23, 2017 · Sep 15, 2017 · Sep 29, 2017 · Oct 1, 2017
diff --git a/appinfo/database.xml b/appinfo/database.xml
@@ -316,6 +316,44 @@
             </index>
         </declaration>
     </table>
+    <table>
+        <name>*dbprefix*deck_assigned_users</name>
+        <declaration>
+            <field>
+                <name>id</name>
+                <type>integer</type>
+                <default>0</default>
+                <notnull>true</notnull>
+                <autoincrement>1</autoincrement>
+                <length>4</length>
+            </field>
+            <field>
+                <name>participant</name>
+                <type>text</type>
+                <notnull>true</notnull>
+                <length>64</length>
+            </field>
+            <field>
+                <name>card_id</name>
+                <type>integer</type>
+                <default>0</default>
+                <notnull>true</notnull>
+                <length>4</length>
+            </field>
+            <index>
+                <name>deck_assigned_users_idx_p</name>
+                <field>
+                    <name>participant</name>
+                </field>
+            </index>
+            <index>
+                <name>deck_assigned_users_idx_c</name>
+                <field>
+                    <name>card_id</name>
+                </field>
+            </index>
+        </declaration>
+    </table>
     <table>
         <name>*dbprefix*deck_board_acl</name>
         <declaration>

diff --git a/appinfo/info.xml b/appinfo/info.xml
@@ -16,7 +16,7 @@
 💥 This is still alpha software: it may not be stable enough for production!
 
 </description>
-    <version>0.3.0-dev1</version>
+    <version>0.3.0-dev2</version>
     <licence>agpl</licence>
     <author>Julius Härtl</author>
     <namespace>Deck</namespace>

diff --git a/appinfo/routes.php b/appinfo/routes.php
@@ -56,6 +56,8 @@
 		['name' => 'card#unarchive', 'url' => '/cards/{cardId}/unarchive', 'verb' => 'PUT'],
 		['name' => 'card#assignLabel', 'url' => '/cards/{cardId}/label/{labelId}', 'verb' => 'POST'],
 		['name' => 'card#removeLabel', 'url' => '/cards/{cardId}/label/{labelId}', 'verb' => 'DELETE'],
+		['name' => 'card#assignUser', 'url' => '/cards/{cardId}/assign', 'verb' => 'POST'],
+		['name' => 'card#unassignUser', 'url' => '/cards/{cardId}/assign/{userId}', 'verb' => 'DELETE'],
 
 		// labels
 		['name' => 'label#create', 'url' => '/labels', 'verb' => 'POST'],

diff --git a/css/style.scss b/css/style.scss
@@ -350,30 +350,71 @@ input.input-inline {
 		padding: 5px;
 	}
 
+	.card-assigned-users {
+		display: flex;
+		justify-content: flex-end;
+		flex-grow: 1;
+		.assigned-user {
+			z-index: 4;
+			margin: 6px 0 6px 6px;
+		}
+	}
+
 	.card-controls {
-		padding: 10px;
 		background: $color-lightgrey;
 		display: flex;
 		position: relative;
+		padding-left: 10px;
 
 		.card-options {
-			opacity: 0.3;
-			position: absolute;
-			right: 10px;
-			top: 8px;
+			justify-content: flex-end;
 		}
 
 		&:hover .card-options {
 			opacity: 1;
 		}
 
 		.icon-filetype-text {
-			margin-right: 10px;
+			margin: 10px;
+			margin-left: 0px;
+		}
+
+		.due {
+			border-radius: 3px;
+			margin: 6px 4px 6px 0px;
+			padding: 0 4px;
+			font-size: 90%;
+			opacity: 0.5;
+			display: flex;
+			align-items: center;
+
+			.icon {
+				background-size: contain;
+			}
+
+			&.overdue {
+				background-color: $color-error;
+				color: $color-primary-text;
+
+				.icon-badge {
+					background-image: url('../img/calendar-white.svg');
+				}
+			}
+			&.now {
+				background-color: $color-warning;
+			}
+			&.next {
+				background-color: $color-warning-light;
+			}
+
+			span {
+				margin-left: 3px;
+			}
 		}
 
 		button {
-			padding: 0px;
-			margin-right: 0px;
+			padding: 22px;
+			margin: 0;
 		}
 	}
 
@@ -492,39 +533,6 @@ input.input-inline {
 	}
 }
 
-.due {
-	border-radius: 3px;
-	margin: -4px 4px -4px -4px;
-	padding: 0px 4px;
-	font-size: 90%;
-	opacity: 0.5;
-	display: flex;
-	align-items: center;
-
-	.icon {
-		background-size: contain;
-	}
-
-	&.overdue {
-		background-color: $color-error;
-		color: $color-primary-text;
-
-		.icon-badge {
-			background-image: url('../img/calendar-white.svg');
-		}
-	}
-	&.now {
-		background-color: $color-warning;
-	}
-	&.next {
-		background-color: $color-warning-light;
-	}
-
-	span {
-		margin-left: 3px;
-	}
-}
-
 /**
  * App sidebar
  */
@@ -595,20 +603,15 @@ input.input-inline {
 		}
 	}
 
-	.select2-container {
-		margin: 0px;
-	}
-
-	h4 {
+	.section-header {
 		border-bottom: 1px solid $color-lightgrey;
-		padding: 15px 0px 5px 0px;
-		margin: 0 0 10px 0;
-		font-size: 15px;
-
-		> div {
-			display: inline-flex;
-			align-content: center;
-			justify-content: space-between;
+		display: flex;
+		margin-bottom: 5px;
+		margin-top: 20px;
+		h4 {
+			padding-top: 5px;
+			padding-bottom: 5px;
+			flex: 1;
 		}
 	}
 
@@ -642,9 +645,36 @@ input.input-inline {
 		text-align: right;
 	}
 
-	#card-tag-label {
-		padding-top: 0px !important;
-		margin-top: 0px;
+	.card-details-assign-users {
+
+		.select2 .ui-select-choices-row-inner {
+			display: flex;
+			padding: 5px !important;
+		}
+
+		.card-details-assign-users-list {
+			display: flex;
+			.assigned-user {
+				position: relative;
+
+				.avatardiv {
+					margin-right: 5px;
+				}
+				.icon-delete {
+					display: none;
+					position: absolute;
+					top: 8px;
+					left: 8px;
+				}
+				&:hover .icon-delete {
+					display: inline-block;
+					cursor: pointer;
+				}
+				&:hover .avatardiv {
+					opacity: .7;
+				}
+			}
+		}
 	}
 
 	#card-description {
@@ -985,10 +1015,19 @@ input.input-inline {
 	}
 }
 
-.select2-container-multi .select2-choices .select2-search-choice {
-	padding: 3px 0 !important;
-	border: 0 !important;
-	overflow: hidden;
+.select2-container {
+	width: 100%;
+	margin: 0;
+
+	.select2-choices {
+		padding: 0 !important;
+
+		.select2-search-choice {
+			padding: 3px 0 !important;
+			border: 0 !important;
+			overflow: hidden;
+		}
+	}
 }
 
 .ui-select-container[disabled] .ui-select-match-item {

diff --git a/js/controller/CardController.js b/js/controller/CardController.js
@@ -23,7 +23,7 @@
 /* global app */
 /* global moment */
 
-app.controller('CardController', function ($scope, $rootScope, $routeParams, $location, $stateParams, $interval, BoardService, CardService, StackService, StatusService) {
+app.controller('CardController', function ($scope, $rootScope, $routeParams, $location, $stateParams, $interval, $timeout, BoardService, CardService, StackService, StatusService) {
 	$scope.sidebar = $rootScope.sidebar;
 	$scope.status = {
 		lastEdit: 0,
@@ -139,4 +139,37 @@ app.controller('CardController', function ($scope, $rootScope, $routeParams, $lo
 		CardService.update(element);
 		StackService.updateCard(element);
 	};
-});
+
+	/**
+	 * Show ui-select field when clicking the add button
+	 */
+	$scope.showAssignUser = function() {
+		$scope.status.showAssignUser = true;
+		$timeout(function() {
+			$('#assignUserSelect').find('a').click();
+		});
+	};
+
+	/**
+	 * Hide ui-select when select list is closed
+	 */
+	$scope.assingUserOpenClose = function(isOpen) {
+		if (!isOpen) {
+			$scope.status.showAssignUser = false;
+		}
+	};
+
+	$scope.addAssignedUser = function(item) {
+		CardService.assignUser(CardService.getCurrent(), item.uid).then(function (data) {
+			StackService.updateCard(CardService.getCurrent());
+		});
+		$scope.status.showAssignUser = false;
+	};
+
+	$scope.removeAssignedUser = function(item) {
+		CardService.unassignUser(CardService.getCurrent(), item.participant.uid).then(function (data) {
+			StackService.updateCard(CardService.getCurrent());
+		});
+	};
+
+});
diff --git a/js/filters/withoutAssignedUsers.js b/js/filters/withoutAssignedUsers.js
@@ -0,0 +1,45 @@
+/*
+ * @copyright Copyright (c) 2017 Julius Härtl <jus@bitgrid.net>
+ *
+ * @author Julius Härtl <jus@bitgrid.net>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *  
+ */
+
+/* global app */
+/* global angular */
+
+/*
+ * Remove all assignedUsers from users list
+ */
+app.filter('withoutAssignedUsers', function () {
+	return function (users, assignedUsers) {
+		var _result = [];
+		angular.forEach(users, function (user) {
+			var _found = false;
+			angular.forEach(assignedUsers, function (assignedUser) {
+				if (assignedUser.participant.uid === user.uid) {
+					_found = true;
+				}
+			});
+			if (_found === false) {
+				_result.push(user);
+			}
+		});
+		return _result;
+	};
+});