From a9e28065bfbcb000bcd204ed99fbd16df5ad7042 Mon Sep 17 00:00:00 2001 From: Philippe PITTOLI Date: Tue, 10 Dec 2019 03:34:08 +0100 Subject: [PATCH] hardcoded users and permissions, but still --- client/project-creation-modal.ls | 94 ++++++++++++++++++++++++-------- client/task-creation-modal.ls | 2 + client/task.ls | 2 +- 3 files changed, 73 insertions(+), 25 deletions(-) diff --git a/client/project-creation-modal.ls b/client/project-creation-modal.ls index da13103..09936bf 100644 --- a/client/project-creation-modal.ls +++ b/client/project-creation-modal.ls @@ -24,16 +24,28 @@ col-to-lines = (column, self) -> } [ "DELETE" ] ] -#
-#

-# -#

-#

-# -# @gmail.com -# -#

-#
+# TODO FIXME XXX HARDCODE +users = [ + { login: "jean", id: "1003" } + { login: "martin", id: "1004" } + { login: "damien", id: "1005" } +] + +user-form-selection = (self, user) -> + h \option { + value: user.id + } [ user.login ] + +permission-groups = [ + "Admin" + "Write" + "Read" +] + +permission-to-form-selection = (self, permission) -> + h \option { + value: permission + } [ permission ] ProjectCreationModal = (project, todod-ws) -> @@ -49,7 +61,11 @@ ProjectCreationModal = (project, todod-ws) -> self = { title: project.title || "" permissions: project.permissions || [[]] - new-user: "New user" + # new-user: "New user" + new-user-permission: { + id: void + permission: void + } new-column-input: { title: "New column !" } @@ -73,19 +89,18 @@ ProjectCreationModal = (project, todod-ws) -> } ] - h \hr [] + # h \hr [] - bulma.field [ - bulma.label "Adding a user" - bulma.input { - value: self.new-user - oninput: (e) -> - self.new-user := e.target.value - - name: \new-user - id: \user-add - } - ] + # bulma.field [ + # bulma.label "Adding a user" + # bulma.input { + # value: self.new-user + # oninput: (e) -> + # self.new-user := e.target.value + # name: \new-user + # id: \user-add + # } + # ] h \hr [] @@ -103,6 +118,38 @@ ProjectCreationModal = (project, todod-ws) -> h \hr [] + h \p [ "Adding new user" ] + + # TODO: + # 1. select a permission groups + # 2. select an user + + h \div.field.has-addons { + key: "adding-user" + } [ + h \div.select.control [ + h \select { + onchange: (e) -> + self.new-user-permission.permission := e.target.value + } permission-groups.map (permission) -> permission-to-form-selection self, permission + ] + + h \div.select.control.is-expanded [ + h \select { + onchange: (e) -> + self.new-user-permission.id := e.target.value + } users.map (user) -> user-form-selection self, user + ] + + h \div.control.button.is-success.is-outlined { + onclick: -> + # TODO + console.log "right: #{self.new-user-permission.permission}, user #{self.new-user-permission.id}" + } [ "+" ] + ] + + h \hr [] + h \p [ "Choose the columns" ] for dom in (self.extra_properties.columns.map (column) -> col-to-lines column, self) @@ -131,7 +178,6 @@ ProjectCreationModal = (project, todod-ws) -> self.new-column-input.title := "New column !" } [ "+" ] ] - ] on-validation: -> diff --git a/client/task-creation-modal.ls b/client/task-creation-modal.ls index d04f3d9..9dbb91d 100644 --- a/client/task-creation-modal.ls +++ b/client/task-creation-modal.ls @@ -1,4 +1,6 @@ +# TODO: on modification, the description isn't updated on the client + h = require 'maquette' .h Modal = require './modal.ls' diff --git a/client/task.ls b/client/task.ls index 574740a..e60673c 100644 --- a/client/task.ls +++ b/client/task.ls @@ -58,7 +58,7 @@ Task = (self, project, todod-ws) -> modal := TaskCreationModal project, todod-ws, self } [ "Edit" ] - h \div.button { + h \div.button.is-danger { onclick: -> modal := TaskRemovalModal project.id, todod-ws, self } [ "X" ]