Merge branch 'module/poll' into dev
This commit is contained in:
@@ -23,6 +23,7 @@ dependencies{
|
||||
implementation(project(":markdown"))
|
||||
implementation(project(":messages"))
|
||||
implementation(project(":notes"))
|
||||
implementation(project(":poll"))
|
||||
implementation(project(":project"))
|
||||
implementation(project(":stock"))
|
||||
implementation(project(":tags"))
|
||||
|
||||
@@ -23,6 +23,7 @@ import de.srsoftware.umbrella.markdown.MarkdownApi;
|
||||
import de.srsoftware.umbrella.message.MessageSystem;
|
||||
import de.srsoftware.umbrella.messagebus.MessageApi;
|
||||
import de.srsoftware.umbrella.notes.NoteModule;
|
||||
import de.srsoftware.umbrella.poll.PollModule;
|
||||
import de.srsoftware.umbrella.project.ProjectModule;
|
||||
import de.srsoftware.umbrella.stock.StockModule;
|
||||
import de.srsoftware.umbrella.tags.TagModule;
|
||||
@@ -81,6 +82,7 @@ public class Application {
|
||||
new MarkdownApi().bindPath("/api/markdown").on(server);
|
||||
new NoteModule(config).bindPath("/api/notes").on(server);
|
||||
new StockModule(config).bindPath("/api/stock").on(server);
|
||||
new PollModule(config).bindPath("/api/poll").on(server);
|
||||
new ProjectModule(config).bindPath("/api/project").on(server);
|
||||
new ProjectLegacy(config).bindPath("/legacy/project").on(server);
|
||||
new TaskModule(config).bindPath("/api/task").on(server);
|
||||
|
||||
@@ -12,6 +12,7 @@ public class ModuleRegistry {
|
||||
private FileService fileService;
|
||||
private MarkdownService markdownService;
|
||||
private NoteService noteService;
|
||||
private PollService pollService;
|
||||
private PostBox postBox;
|
||||
private ProjectService projectService;
|
||||
private StockService stockService;
|
||||
@@ -36,6 +37,7 @@ public class ModuleRegistry {
|
||||
case StockService is: singleton.stockService = is; break;
|
||||
case MarkdownService ms: singleton.markdownService = ms; break;
|
||||
case NoteService ns: singleton.noteService = ns; break;
|
||||
case PollService ps: singleton.pollService = ps; break;
|
||||
case PostBox pb: singleton.postBox = pb; break;
|
||||
case ProjectService ps: singleton.projectService = ps; break;
|
||||
case TagService ts: singleton.tagService = ts; break;
|
||||
@@ -81,6 +83,10 @@ public class ModuleRegistry {
|
||||
return singleton.noteService;
|
||||
}
|
||||
|
||||
public static PollService pollService() {
|
||||
return singleton.pollService;
|
||||
}
|
||||
|
||||
public static PostBox postBox() {
|
||||
return singleton.postBox;
|
||||
}
|
||||
|
||||
@@ -0,0 +1,5 @@
|
||||
/* © SRSoftware 2025 */
|
||||
package de.srsoftware.umbrella.core.api;
|
||||
|
||||
public interface PollService {
|
||||
}
|
||||
@@ -51,10 +51,12 @@ public class Field {
|
||||
public static final String DUE_DATE = "due_date";
|
||||
public static final String DURATION = "duration";
|
||||
|
||||
public static final String EDITOR = "editor";
|
||||
public static final String EMAIL = "email";
|
||||
public static final String END_TIME = "end_time";
|
||||
public static final String ENTITY_ID = "entity_id";
|
||||
public static final String EST_TIME = "est_time";
|
||||
public static final String EVALUATION = "evaluation";
|
||||
public static final String EXPECTED = "expected";
|
||||
public static final String EXPIRATION = "expiration";
|
||||
|
||||
@@ -102,7 +104,9 @@ public class Field {
|
||||
|
||||
public static final String OBJECT = "object";
|
||||
public static final String OFFSET = "offset";
|
||||
public static final String OPTIONS = "options";
|
||||
public static final String OPTIONAL = "optional";
|
||||
public static final String OPTION_ID = "option_id";
|
||||
public static final String OWNER = "owner";
|
||||
public static final String OWNER_NUMBER = "owner_number";
|
||||
|
||||
@@ -113,11 +117,13 @@ public class Field {
|
||||
public static final String PATH = "path";
|
||||
public static final String PERMISSION = "permission";
|
||||
public static final String PHONE = "phone";
|
||||
public static final String POLL_ID = "poll_id";
|
||||
public static final String POS = "pos";
|
||||
public static final String POSITIONS = "positions";
|
||||
public static final String PRICE = "single_price";
|
||||
public static final String PRICE_FORMAT = "price_format";
|
||||
public static final String PRIORITY = "priority";
|
||||
public static final String PRIVATE = "private";
|
||||
public static final String PROJECT = "project";
|
||||
public static final String PROJECT_ID = "project_id";
|
||||
public static final String PROPERTIES = "properties";
|
||||
@@ -127,9 +133,11 @@ public class Field {
|
||||
public static final String RENDERED = "rendered";
|
||||
public static final String REQUIRED_TASKS_IDS = "required_tasks_ids";
|
||||
|
||||
public static final String SELECTION = "selection";
|
||||
public static final String SENDER = "sender";
|
||||
public static final String SENDER_USER_ID = "sender_user_id";
|
||||
public static final String SETTINGS = "settings";
|
||||
public static final String SHARES = "shares";
|
||||
public static final String SHOW_CLOSED = "show_closed";
|
||||
public static final String SILENT = "silent";
|
||||
public static final String SOURCE = "source";
|
||||
@@ -178,4 +186,6 @@ public class Field {
|
||||
public static final String VERSION = "version";
|
||||
public static final String VERSIONS = "versions";
|
||||
|
||||
public static final String WEIGHT = "weight";
|
||||
public static final String WEIGHTS = "weights";
|
||||
}
|
||||
|
||||
@@ -13,6 +13,8 @@ public class Path {
|
||||
public static final String COMPANY = "company";
|
||||
public static final String CONNECTED = "connected";
|
||||
|
||||
public static final String EVALUATE = "evaluate";
|
||||
|
||||
public static final String ITEM = "item";
|
||||
|
||||
public static final String JSON = "json";
|
||||
@@ -27,8 +29,11 @@ public class Path {
|
||||
|
||||
public static final String MENU = "menu";
|
||||
|
||||
public static final String OPTION = "option";
|
||||
|
||||
public static final String PAGE = "page";
|
||||
public static final String PASSWORD = "password";
|
||||
public static final String PERMISSIONS = "permissions";
|
||||
public static final String PROJECT = "project";
|
||||
public static final String PROPERTIES = "properties";
|
||||
public static final String PROPERTY = "property";
|
||||
@@ -37,6 +42,7 @@ public class Path {
|
||||
public static final String REDIRECT = "redirect";
|
||||
|
||||
public static final String SEARCH = "search";
|
||||
public static final String SELECT = "select";
|
||||
public static final String SETTINGS = "settings";
|
||||
public static final String STATES = "states";
|
||||
public static final String STARTED = "started";
|
||||
@@ -49,4 +55,5 @@ public class Path {
|
||||
public static final String USER = "user";
|
||||
public static final String USES = "uses";
|
||||
|
||||
public static final String WEIGHT = "weight";
|
||||
}
|
||||
|
||||
@@ -24,6 +24,7 @@ public class Text {
|
||||
public static final String DOCUMENT_WITH_ID = "document ({id})";
|
||||
|
||||
public static final String EMAILS_FOR_RECEIVER = "emails for {email}";
|
||||
public static final String EVALUATION = "evaluation";
|
||||
|
||||
public static final String FILES = "files";
|
||||
|
||||
@@ -39,12 +40,18 @@ public class Text {
|
||||
public static final String MESSAGE = "message";
|
||||
public static final String MESSAGES = "messages";
|
||||
|
||||
public static final String NOT_ALLOWED_TO_EDIT = "You are not allowed to edit {object}!";
|
||||
public static final String NOT_ALLOWED_TO_EVALUATE = "You are not allowed to evaluate this {object}!";
|
||||
public static final String NOTE = "note";
|
||||
public static final String NOTES = "notes";
|
||||
public static final String NOTE_WITH_ID = "note ({id})";
|
||||
public static final String NUMBER = "number";
|
||||
|
||||
public static final Object OPTION = "option"
|
||||
;
|
||||
public static final String PATH = "path";
|
||||
public static final String PERMISSION = "permission";
|
||||
public static final String POLL = "poll";
|
||||
public static final String POLLS = "polls";
|
||||
public static final String PROJECTS = "projects";
|
||||
public static final String PROJECT_WITH_ID = "project ({id})";
|
||||
@@ -54,6 +61,7 @@ public class Text {
|
||||
public static final String RECEIVER = "receiver";
|
||||
public static final String RECEIVERS = "receivers";
|
||||
|
||||
public static final String SELECTIONS = "selections";
|
||||
public static final String SENDER = "sender";
|
||||
public static final String SERVICE_WITH_ID = "service ({id})";
|
||||
public static final String SESSION = "session";
|
||||
@@ -72,11 +80,13 @@ public class Text {
|
||||
public static final String UNIT = "unit";
|
||||
public static final String USER_WITH_ID = "user ({id})";
|
||||
|
||||
public static final String WEIGHT = "weight";
|
||||
public static final String WIKI = "wiki";
|
||||
public static final String WIKI_PAGE = "wiki page";
|
||||
public static final String WIKI_PAGES = "wiki pages";
|
||||
|
||||
public static final String UNIT_PRICE = "unit price";
|
||||
public static final String UNKNOWN_FIELD = "unknown field: {id}";
|
||||
public static final String USER = "user";
|
||||
public static final String USERS = "users";
|
||||
|
||||
|
||||
@@ -31,7 +31,7 @@ public enum Permission implements Mappable {
|
||||
for (var p : Permission.values()){
|
||||
if (p.code == code) return p;
|
||||
}
|
||||
throw new InvalidParameterException(format("{0} is not a valid permission code"));
|
||||
throw new InvalidParameterException(format("{0} is not a valid permission code",code));
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
248
core/src/main/java/de/srsoftware/umbrella/core/model/Poll.java
Normal file
248
core/src/main/java/de/srsoftware/umbrella/core/model/Poll.java
Normal file
@@ -0,0 +1,248 @@
|
||||
package de.srsoftware.umbrella.core.model;
|
||||
|
||||
import de.srsoftware.tools.Mappable;
|
||||
import de.srsoftware.umbrella.core.ModuleRegistry;
|
||||
import de.srsoftware.umbrella.core.Util;
|
||||
import de.srsoftware.umbrella.core.api.Owner;
|
||||
import de.srsoftware.umbrella.core.constants.Field;
|
||||
|
||||
import java.sql.ResultSet;
|
||||
import java.sql.SQLException;
|
||||
import java.util.*;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
import static de.srsoftware.umbrella.core.constants.Field.*;
|
||||
import static java.text.MessageFormat.format;
|
||||
|
||||
public class Poll implements Mappable {
|
||||
public static class Option implements Mappable{
|
||||
|
||||
private int id;
|
||||
|
||||
Integer status;
|
||||
private String description;
|
||||
private String name;
|
||||
private final Set<String> dirtyFields = new HashSet<>();
|
||||
public Option(int id, String name, String description, Integer status) {
|
||||
this.id = id;
|
||||
this.name = name;
|
||||
this.description = description;
|
||||
this.status = status;
|
||||
}
|
||||
public String description(){
|
||||
return description;
|
||||
}
|
||||
|
||||
public Option description(String newVal){
|
||||
description = newVal;
|
||||
dirtyFields.add(DESCRIPTION);
|
||||
return this;
|
||||
}
|
||||
|
||||
public int id(){
|
||||
return id;
|
||||
}
|
||||
|
||||
public Option id(Integer newVal){
|
||||
this.id = newVal;
|
||||
dirtyFields.add(ID);
|
||||
return this;
|
||||
}
|
||||
|
||||
public boolean isDirty(){
|
||||
return !dirtyFields.isEmpty();
|
||||
}
|
||||
|
||||
public boolean isNew(){
|
||||
return dirtyFields.contains(ID);
|
||||
}
|
||||
|
||||
public String name(){
|
||||
return name;
|
||||
}
|
||||
|
||||
public Option name(String newVal){
|
||||
name = newVal;
|
||||
dirtyFields.add(NAME);
|
||||
return this;
|
||||
}
|
||||
|
||||
public static Option of(ResultSet rs) throws SQLException {
|
||||
var id = rs.getInt(ID);
|
||||
var name = rs.getString(NAME);
|
||||
var description = rs.getString(DESCRIPTION);
|
||||
var status = rs.getInt(STATUS);
|
||||
|
||||
return new Option(id,name,description,status);
|
||||
}
|
||||
|
||||
public Integer status(){
|
||||
return status;
|
||||
}
|
||||
|
||||
public Option status(int newValue){
|
||||
this.status = newValue;
|
||||
dirtyFields.add(STATUS);
|
||||
return this;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Map<String, Object> toMap() {
|
||||
return Map.of(
|
||||
ID,id,
|
||||
NAME,name,
|
||||
DESCRIPTION, Map.of(
|
||||
SOURCE,description,
|
||||
RENDERED,Util.markdown(description)
|
||||
),
|
||||
STATUS,status
|
||||
);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return format("Option \"{0}\"",name);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
public static class Evaluation {
|
||||
// Map<Option → Map<Weight → Count>>
|
||||
private HashMap<Integer,Map<Integer,Integer>> selections = new HashMap<>();
|
||||
public void count(ResultSet rs) throws SQLException {
|
||||
var optionId = rs.getInt(OPTION_ID);
|
||||
var userId = rs.getObject(USER_ID);
|
||||
var weight = rs.getInt(WEIGHT);
|
||||
var optionStats = selections.computeIfAbsent(optionId, k -> new HashMap<>());
|
||||
optionStats.compute(weight, (k, sum) -> sum == null ? 1 : sum + 1);
|
||||
}
|
||||
|
||||
public HashMap<Integer, Map<Integer, Integer>> toMap() {
|
||||
return selections;
|
||||
}
|
||||
|
||||
}
|
||||
private Owner owner;
|
||||
private String id, name, description;
|
||||
|
||||
private boolean isPrivate;
|
||||
private List<Option> options;
|
||||
private Map<Integer,String> weights;
|
||||
private Map<UmbrellaUser,Permission> permissions;
|
||||
private Set<String> dirtyFields = new HashSet<>();
|
||||
public Poll(String id, Owner owner, String name, String description, boolean isPrivate, List<Option> options, Map<Integer,String> weights){
|
||||
this.id = id;
|
||||
this.owner = owner;
|
||||
this.name = name;
|
||||
this.description = description;
|
||||
this.isPrivate = isPrivate;
|
||||
this.options = new ArrayList<>();
|
||||
this.weights = new HashMap<>();
|
||||
this.permissions = new HashMap<>();
|
||||
}
|
||||
public String description(){
|
||||
return description;
|
||||
}
|
||||
|
||||
public Poll description(String newVal){
|
||||
description = newVal;
|
||||
dirtyFields.add(DESCRIPTION);
|
||||
return this;
|
||||
}
|
||||
|
||||
public String id(){
|
||||
return id;
|
||||
}
|
||||
|
||||
public boolean isDirty(){
|
||||
return !dirtyFields.isEmpty();
|
||||
}
|
||||
|
||||
public boolean isDirty(String ... fields){
|
||||
for (var field : fields){
|
||||
if (dirtyFields.contains(field)) return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
public boolean isPrivate(){
|
||||
return isPrivate;
|
||||
}
|
||||
|
||||
private Map<Long, Map<String, Object>> mapPermissions() {
|
||||
var result = new HashMap<Long,Map<String,Object>>();
|
||||
for (var entry : permissions.entrySet()){
|
||||
var user = entry.getKey();
|
||||
var data = user.toMap();
|
||||
data.put(Field.PERMISSION,entry.getValue().toMap());
|
||||
result.put(user.id(),data);
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
public String name(){
|
||||
return name;
|
||||
}
|
||||
|
||||
public Poll name(String newVal){
|
||||
name = newVal;
|
||||
dirtyFields.add(NAME);
|
||||
return this;
|
||||
}
|
||||
|
||||
public static Poll of(ResultSet rs) throws SQLException {
|
||||
var id = rs.getString(ID);
|
||||
var userId = rs.getLong(Field.USER_ID);
|
||||
var name = rs.getString(NAME);
|
||||
var description = rs.getString(Field.DESCRIPTION);
|
||||
var isPrivate = rs.getBoolean(Field.PRIVATE);
|
||||
var owner = ModuleRegistry.userService().loadUser(userId);
|
||||
|
||||
return new Poll(id,owner,name,description,isPrivate,new ArrayList<>(),new HashMap<>());
|
||||
}
|
||||
|
||||
public List<Option> options(){
|
||||
return options;
|
||||
}
|
||||
|
||||
public Owner owner(){
|
||||
return owner;
|
||||
}
|
||||
|
||||
public Poll setPrivate(boolean newValue) {
|
||||
if (newValue != isPrivate) dirtyFields.add(PRIVATE);
|
||||
isPrivate = newValue;
|
||||
return this;
|
||||
}
|
||||
|
||||
public Poll setWeight(Integer weight, String description) {
|
||||
weights.put(weight,description);
|
||||
dirtyFields.add(WEIGHTS);
|
||||
return this;
|
||||
}
|
||||
|
||||
public Map<UmbrellaUser, Permission> permissions(){
|
||||
return permissions;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Map<String, Object> toMap() {
|
||||
return Map.of(
|
||||
ID, id,
|
||||
Field.OWNER, owner.toMap(),
|
||||
NAME,name,
|
||||
Field.DESCRIPTION, Map.of(
|
||||
Field.SOURCE,description,
|
||||
Field.RENDERED,Util.markdown(description)
|
||||
),
|
||||
Field.OPTIONS, options.stream().collect(Collectors.toMap(Option::id,Option::toMap)),
|
||||
Field.PERMISSION, mapPermissions(),
|
||||
Field.PRIVATE, isPrivate,
|
||||
Field.WEIGHTS, weights
|
||||
);
|
||||
}
|
||||
|
||||
public Map<Integer, String> weights(){
|
||||
return weights;
|
||||
}
|
||||
}
|
||||
@@ -14,8 +14,10 @@
|
||||
import ContactList from "./routes/contact/Index.svelte";
|
||||
import DocList from "./routes/document/List.svelte";
|
||||
import EasyList from "./routes/task/EasyList.svelte";
|
||||
import EditPoll from "./routes/poll/Edit.svelte";
|
||||
import EditService from "./routes/user/EditService.svelte";
|
||||
import EditUser from "./routes/user/EditUser.svelte";
|
||||
import EvalPoll from "./routes/poll/Evaluate.svelte";
|
||||
import FileIndex from "./routes/files/Index.svelte";
|
||||
import Footer from "./Components/Footer.svelte";
|
||||
import Kanban from "./routes/project/Kanban.svelte";
|
||||
@@ -25,6 +27,7 @@
|
||||
import Menu from "./Components/Menu.svelte";
|
||||
import NewPage from "./routes/wiki/AddPage.svelte";
|
||||
import Notes from "./routes/notes/Index.svelte";
|
||||
import PollList from "./routes/poll/Index.svelte";
|
||||
import ProjectList from "./routes/project/List.svelte";
|
||||
import ProjectAdd from "./routes/project/Create.svelte";
|
||||
import ResetPw from "./routes/user/ResetPw.svelte";
|
||||
@@ -37,6 +40,7 @@
|
||||
import Times from "./routes/time/Index.svelte";
|
||||
import User from "./routes/user/User.svelte";
|
||||
import ViewDoc from "./routes/document/View.svelte";
|
||||
import ViewPoll from "./routes/poll/View.svelte";
|
||||
import ViewPrj from "./routes/project/View.svelte";
|
||||
import ViewTask from "./routes/task/View.svelte";
|
||||
import WikiIndex from "./routes/wiki/Index.svelte";
|
||||
@@ -95,6 +99,10 @@
|
||||
<Route path="/message" component={Messages} />
|
||||
<Route path="/message/settings" component={MsgSettings} />
|
||||
<Route path="/notes" component={Notes} />
|
||||
<Route path="/poll" component={PollList} />
|
||||
<Route path="/poll/:id/edit" component={EditPoll} />
|
||||
<Route path="/poll/:id/evaluate" component={EvalPoll} />
|
||||
<Route path="/poll/:id/view" component={ViewPoll} />
|
||||
<Route path="/project" component={ProjectList} />
|
||||
<Route path="/project/add" component={ProjectAdd} />
|
||||
<Route path="/project/:project_id/add_task" component={AddTask} />
|
||||
@@ -137,6 +145,7 @@
|
||||
{/if}
|
||||
<Route path="/user/reset/pw" component={ResetPw} />
|
||||
<Route path="/oidc_callback" component={Callback} />
|
||||
<Route path="/poll/:id/view" component={ViewPoll} />
|
||||
<Route path="/wiki/:key/view" component={WikiGuest} />
|
||||
<Route>
|
||||
<Login />
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
<script>
|
||||
<script>
|
||||
import { activeField } from './field_sync.svelte.js';
|
||||
import { t } from '../translations.svelte.js';
|
||||
|
||||
@@ -110,7 +110,7 @@
|
||||
</style>
|
||||
|
||||
{#if editable && editing}
|
||||
<input bind:value={editValue} onkeyup={typed} autofocus />
|
||||
<input bind:value={editValue} onkeyup={typed} {title} autofocus />
|
||||
{:else}
|
||||
<svelte:element this={type} href={href} onclick={ignore} {onmousedown} {onmouseup} {ontouchstart} {ontouchend} {oncontextmenu} class={{editable}} {title} >{value}</svelte:element>
|
||||
{/if}
|
||||
|
||||
@@ -129,8 +129,8 @@
|
||||
}
|
||||
</style>
|
||||
|
||||
<div class="markdown {editing?'editing':''}">
|
||||
{#if editing}
|
||||
<div class="markdown {editing || simple ?'editing':''}">
|
||||
{#if editing || simple}
|
||||
<span class="hint">{@html t('markdown_supported')}</span>
|
||||
{#if stored_source}
|
||||
<span id="restore_markdown" onclick={restore} class="hint">{t('unsaved_content')}</span>
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
let {
|
||||
addMember = (entry) => console.log(`no handler for addMember(${entry})`),
|
||||
dropMember = (member) => console.log(`no handler for dropMember(${member})`),
|
||||
getCandidates = text => {},
|
||||
getCandidates = defaultGetCandidates,
|
||||
members,
|
||||
updatePermission = (uid,perm) => console.log(`no handler for updatePermission(${uid}, ${perm})`)
|
||||
} = $props();
|
||||
@@ -18,6 +18,21 @@
|
||||
let permissions = $state(null);
|
||||
let sortedMembers = $derived.by(() => Object.values(members).sort((a, b) => a.user.name.localeCompare(b.user.name)));
|
||||
|
||||
async function defaultGetCandidates(text){
|
||||
const url = api('user/search');
|
||||
const resp = await fetch(url,{
|
||||
credentials : 'include',
|
||||
method : 'POST',
|
||||
body : text
|
||||
});
|
||||
if (resp.ok){
|
||||
var json = await resp.json();
|
||||
return Object.fromEntries(Object.values(json).map(user => [user.id,user.name]));
|
||||
} else {
|
||||
return [];
|
||||
}
|
||||
}
|
||||
|
||||
async function loadPermissions(){
|
||||
const url = api('task/permissions');
|
||||
const resp = await fetch(url,{credentials: 'include'});
|
||||
@@ -37,7 +52,7 @@
|
||||
|
||||
<table>
|
||||
<tbody>
|
||||
{#each sortedMembers as member,i}
|
||||
{#each sortedMembers as member (member.user.id)}
|
||||
<tr>
|
||||
<td>{member.user.name}</td>
|
||||
<td>
|
||||
|
||||
223
frontend/src/routes/poll/Edit.svelte
Normal file
223
frontend/src/routes/poll/Edit.svelte
Normal file
@@ -0,0 +1,223 @@
|
||||
<script>
|
||||
import { onMount } from 'svelte';
|
||||
import { useTinyRouter } from 'svelte-tiny-router';
|
||||
|
||||
import LineEditor from '../../Components/LineEditor.svelte';
|
||||
import MarkdownEditor from '../../Components/MarkdownEditor.svelte';
|
||||
import Permissions from '../../Components/PermissionEditor.svelte';
|
||||
|
||||
import { api, get, patch, post } from '../../urls.svelte';
|
||||
import { error, yikes } from '../../warn.svelte';
|
||||
import { t } from '../../translations.svelte';
|
||||
import { user } from '../../user.svelte.js';
|
||||
|
||||
let { id } = $props();
|
||||
let visible_to_guests = false;
|
||||
let new_option = $state({name:'',description:{'source':'',rendered:''}});
|
||||
let new_weight = $state({description:'',weight:0});
|
||||
let poll = $state(null);
|
||||
let members = $state([]);
|
||||
|
||||
function addMember(member){
|
||||
for (let [id,name] of Object.entries(member)) update_permissions({user_id:+id,permission:4});
|
||||
return true;
|
||||
}
|
||||
|
||||
function dropMember(member){
|
||||
let user_id = member.user.id;
|
||||
if (update_permissions({user_id,permission:0})){
|
||||
members = members.filter(m => m.user.id != user_id);
|
||||
}
|
||||
}
|
||||
|
||||
async function load(){
|
||||
let url = api('poll/'+id);
|
||||
let res = await get(url);
|
||||
if (res.ok){
|
||||
poll = await res.json();
|
||||
for (let perm of Object.values(poll.permission)){
|
||||
members.push({ user : { name : perm.name, id : perm.id }, permission: { name : perm.permission.name, code: perm.permission.code}});
|
||||
}
|
||||
visible_to_guests = !poll.private;
|
||||
yikes();
|
||||
} else error(res);
|
||||
}
|
||||
|
||||
async function patch_poll(field, newVal){
|
||||
let url = api(`poll/${id}`);
|
||||
let data = {}
|
||||
data[field] = newVal;
|
||||
let res = await patch(url,data);
|
||||
if (res.ok) {
|
||||
yikes();
|
||||
const json = await res.json();
|
||||
poll = { ...poll, ...json };
|
||||
return true;
|
||||
|
||||
}
|
||||
error(res);
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
async function patch_option(option, field, newVal){
|
||||
let url = api(`poll/${id}/option/${option.id}`);
|
||||
let res = await patch(url,{[field]: newVal});
|
||||
if (res.ok) {
|
||||
yikes();
|
||||
const json = await res.json();
|
||||
if (field == 'name' && newVal == ''){
|
||||
poll.options = poll.options.filter(o => o.id !== option.id);
|
||||
} else poll.options = json.options;
|
||||
return true;
|
||||
}
|
||||
error(res);
|
||||
return false;
|
||||
}
|
||||
|
||||
async function patch_weight(data){
|
||||
let url = api(`poll/${id}/weight`);
|
||||
let res = await patch(url,data);
|
||||
if (res.ok) {
|
||||
yikes();
|
||||
const json = await res.json();
|
||||
const weights = json.weights;
|
||||
for (let weight of Object.keys(data)){
|
||||
let desc = data[weight];
|
||||
if (desc) {
|
||||
poll.weights[weight] = desc;
|
||||
} else delete poll.weights[weight]; // TODO: this corrupts the display of the following element!
|
||||
}
|
||||
return true;
|
||||
}
|
||||
error(res);
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
async function save_new_option(){
|
||||
if (!new_option.name) return;
|
||||
let url = api('poll/'+id+'/option');
|
||||
let res = await post(url,new_option);
|
||||
if (res.ok){
|
||||
yikes();
|
||||
const json = await res.json();
|
||||
poll.options = json.options;
|
||||
} else error(res);
|
||||
}
|
||||
|
||||
function save_new_weight(e){
|
||||
const data = {};
|
||||
data[new_weight.weight] = new_weight.description;
|
||||
patch_weight(data);
|
||||
}
|
||||
|
||||
function toggle_guest(e){
|
||||
patch_poll('private',!visible_to_guests);
|
||||
}
|
||||
|
||||
async function update_permissions(data){
|
||||
let url = api(`poll/${id}/permissions`);
|
||||
let res = await post(url,data);
|
||||
if (res.ok) {
|
||||
yikes();
|
||||
let json = await res.json();
|
||||
members = members.filter(m => m.user.id != json.user.id);
|
||||
members.push(json);
|
||||
console.log({members});
|
||||
return true;
|
||||
}
|
||||
error(res);
|
||||
return false;
|
||||
}
|
||||
|
||||
onMount(load);
|
||||
|
||||
</script>
|
||||
|
||||
<fieldset>
|
||||
<legend>{t('edit poll',{id:id})}</legend>
|
||||
{#if poll && poll.name}
|
||||
<fieldset>
|
||||
<legend>{t('name')}</legend>
|
||||
<LineEditor bind:value={poll.name} editable={true} onSet={name => patch_poll('name',name)} />
|
||||
</fieldset>
|
||||
<fieldset>
|
||||
<legend>{t('description')}</legend>
|
||||
<MarkdownEditor bind:value={poll.description} onSet={desc => patch_poll('description',desc)} />
|
||||
</fieldset>
|
||||
<fieldset>
|
||||
<legend>{t('permissions')}</legend>
|
||||
<Permissions {addMember} {members} {dropMember} updatePermission={(user_id,perm) => update_permissions({user_id,permission:perm.code})} />
|
||||
<label>
|
||||
<input type="checkbox" bind:checked={visible_to_guests} onchange={toggle_guest} />
|
||||
{t('visible_to_guests')}
|
||||
</label>
|
||||
</fieldset>
|
||||
<fieldset>
|
||||
<legend>{t('options')}</legend>
|
||||
<table>
|
||||
<thead>
|
||||
<tr>
|
||||
<th>{t('name')}</th>
|
||||
<th>{t('description')}</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{#each Object.entries(poll.options) as [option_id, option]}
|
||||
<tr>
|
||||
<td>
|
||||
<LineEditor editable={true} value={option.name} onSet={name => patch_option(option,'name',name)} title={t('clear to remove')} />
|
||||
</td>
|
||||
<td>
|
||||
<MarkdownEditor bind:value={option.description} onSet={desc => patch_option(option,'description',desc)} />
|
||||
</td>
|
||||
</tr>
|
||||
{/each}
|
||||
<tr>
|
||||
<td class="new_option">
|
||||
{t('add element',{element:t('options')})}
|
||||
<input type="text" bind:value={new_option.name} />
|
||||
</td>
|
||||
<td>
|
||||
<MarkdownEditor simple={true} bind:value={new_option.description} />
|
||||
<button onclick={save_new_option}>{t('save')}</button>
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</fieldset>
|
||||
<fieldset>
|
||||
<legend>{t('weights')}</legend>
|
||||
<table>
|
||||
<thead>
|
||||
<tr>
|
||||
<th>{t('weight')}</th>
|
||||
<th>{t('description')}</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{#each Object.entries(poll.weights) as [weight,descr] (weight)}
|
||||
<tr>
|
||||
<td>
|
||||
<input type="number" value={weight} />
|
||||
</td>
|
||||
<td>
|
||||
<LineEditor editable={true} value={descr} onSet={desc => patch_weight({[weight]: desc})} />
|
||||
</td>
|
||||
</tr>
|
||||
{/each}
|
||||
<tr>
|
||||
<td>
|
||||
<input type="number" bind:value={new_weight.weight} />
|
||||
</td>
|
||||
<td>
|
||||
<input type="text" bind:value={new_weight.description} />
|
||||
<button onclick={save_new_weight}>{t('save')}</button>
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</fieldset>
|
||||
{/if}
|
||||
</fieldset>
|
||||
85
frontend/src/routes/poll/Evaluate.svelte
Normal file
85
frontend/src/routes/poll/Evaluate.svelte
Normal file
@@ -0,0 +1,85 @@
|
||||
<script>
|
||||
import { onMount } from 'svelte';
|
||||
import { api, get } from '../../urls.svelte';
|
||||
import { error, yikes } from '../../warn.svelte';
|
||||
import { t } from '../../translations.svelte';
|
||||
let { id } = $props();
|
||||
let poll = $state(null);
|
||||
|
||||
function average(hist){
|
||||
let count = 0;
|
||||
let sum = 0;
|
||||
for (let [k,v] of Object.entries(hist)) {
|
||||
count += v;
|
||||
sum += k*v;
|
||||
}
|
||||
return count > 0 ? sum/count : '?';
|
||||
}
|
||||
|
||||
function max_val(hist){
|
||||
return Math.max(...Object.values(hist));
|
||||
}
|
||||
|
||||
async function load(){
|
||||
let url = api('poll/evaluate/'+id);
|
||||
let res = await get(url);
|
||||
if (res.ok){
|
||||
poll = await res.json();
|
||||
yikes();
|
||||
} else error(res);
|
||||
}
|
||||
|
||||
onMount(load);
|
||||
</script>
|
||||
|
||||
<style>
|
||||
.histogram > span{
|
||||
display: inline-block;
|
||||
border: 1px solid lime;
|
||||
vertical-align: bottom;
|
||||
position: relative;
|
||||
width: 20px;
|
||||
}
|
||||
.histogram{
|
||||
height: 60px;
|
||||
}
|
||||
.histogram span span{
|
||||
position: absolute;
|
||||
bottom: 0;
|
||||
}
|
||||
</style>
|
||||
|
||||
{#if poll}
|
||||
<fieldset>
|
||||
<legend>{poll.name}</legend>
|
||||
<div class="description">{@html poll.description.rendered}</div>
|
||||
<table>
|
||||
<thead>
|
||||
<tr>
|
||||
<td>{t('option')}</td>
|
||||
<td>{t('average')}</td>
|
||||
<td>{t('histogram')}</td>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{#each Object.entries(poll.evaluation) as [option_id,hist]}
|
||||
<tr>
|
||||
<td>
|
||||
{poll.options[option_id].name}
|
||||
</td>
|
||||
<td>
|
||||
{average(hist)}
|
||||
</td>
|
||||
<td class="histogram">
|
||||
{#each Object.entries(hist).sort((a,b) => a[0] - b[0]) as [weight,count]}
|
||||
<span style="height: {100*count/max_val(hist)}%">
|
||||
<span>{weight}</span>
|
||||
</span>
|
||||
{/each}
|
||||
</td>
|
||||
</tr>
|
||||
{/each}
|
||||
</tbody>
|
||||
</table>
|
||||
</fieldset>
|
||||
{/if}
|
||||
88
frontend/src/routes/poll/Index.svelte
Normal file
88
frontend/src/routes/poll/Index.svelte
Normal file
@@ -0,0 +1,88 @@
|
||||
<script>
|
||||
import { onMount } from 'svelte';
|
||||
|
||||
import LineEditor from '../../Components/LineEditor.svelte';
|
||||
|
||||
import { useTinyRouter } from 'svelte-tiny-router';
|
||||
import { api, get, post } from '../../urls.svelte';
|
||||
import { error, yikes } from '../../warn.svelte';
|
||||
import { t } from '../../translations.svelte';
|
||||
import { user } from '../../user.svelte.js';
|
||||
|
||||
let polls = $state([]);
|
||||
let router = useTinyRouter();
|
||||
|
||||
async function create_poll(name){
|
||||
const url = api('poll');
|
||||
const res = await post(url,{name});
|
||||
if (res.ok) {
|
||||
yikes();
|
||||
const json = await res.json();
|
||||
polls.push(json);
|
||||
}
|
||||
error(res);
|
||||
}
|
||||
|
||||
function edit(poll){
|
||||
router.navigate(`/poll/${poll.id}/edit`);
|
||||
}
|
||||
|
||||
function evaluate(poll){
|
||||
router.navigate(`/poll/${poll.id}/evaluate`);
|
||||
}
|
||||
|
||||
async function load(){
|
||||
let url = api('poll/list');
|
||||
let res = await get(url);
|
||||
if (res.ok){
|
||||
polls = await res.json();
|
||||
yikes();
|
||||
} else error(res);
|
||||
}
|
||||
|
||||
function open(poll){
|
||||
router.navigate(`/poll/${poll.id}/view`);
|
||||
}
|
||||
|
||||
onMount(load);
|
||||
|
||||
</script>
|
||||
|
||||
<fieldset>
|
||||
<legend>{t('polls')}</legend>
|
||||
<table>
|
||||
<thead>
|
||||
<tr>
|
||||
<th>{t('name')}</th>
|
||||
<th>{t('description')}</th>
|
||||
<th>{t('owner')}</th>
|
||||
<th>{t('actions')}</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{#each polls as poll}
|
||||
<tr>
|
||||
<td onclick={e => open(poll)}>{poll.name}</td>
|
||||
<td>{@html poll.description.rendered}</td>
|
||||
<td onclick={e => open(poll)}>{poll.owner.name}</td>
|
||||
<td>
|
||||
{#if user.id}
|
||||
{#if user.id == poll.owner.id || (poll.permission[user.id] && poll.permission[user.id].permission.code == 2)}
|
||||
<button onclick={e => edit(poll)}>{t('edit')}</button>
|
||||
{/if}
|
||||
{#if user.id == poll.owner.id || (poll.permission[user.id] && poll.permission[user.id].permission.code > 0)}
|
||||
<button onclick={e => evaluate(poll)}>{t('evaluate')}</button>
|
||||
{/if}
|
||||
{/if}
|
||||
</td>
|
||||
</tr>
|
||||
{/each}
|
||||
<tr>
|
||||
<td>
|
||||
<LineEditor simple={true} onSet={create_poll}/>
|
||||
</td>
|
||||
<td colspan="3">{t('Enter name to create new')}</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</fieldset>
|
||||
105
frontend/src/routes/poll/View.svelte
Normal file
105
frontend/src/routes/poll/View.svelte
Normal file
@@ -0,0 +1,105 @@
|
||||
<script>
|
||||
import { onMount } from 'svelte';
|
||||
import { api, get, post } from '../../urls.svelte';
|
||||
import { error, yikes } from '../../warn.svelte';
|
||||
import { user } from '../../user.svelte';
|
||||
|
||||
let { id } = $props();
|
||||
import { t } from '../../translations.svelte';
|
||||
let poll = $state(null);
|
||||
let selection = $state({});
|
||||
let editor = $state(user ? { name: user.name, user_id : user.id } : { name : '', user_id : -1 })
|
||||
let disabled = $state(false);
|
||||
|
||||
async function load(){
|
||||
let url = api('poll/'+id);
|
||||
let res = await get(url);
|
||||
if (res.ok){
|
||||
poll = await res.json();
|
||||
yikes();
|
||||
console.log(Object.entries(poll.weights).sort((a,b) => a[0] - b[0]));
|
||||
} else error(res);
|
||||
}
|
||||
|
||||
async function save(ev){
|
||||
disabled = true;
|
||||
let url = api(`poll/${id}/select`);
|
||||
let res = await post(url,{editor,selection});
|
||||
if (res.ok) {
|
||||
yikes();
|
||||
} else error(res);
|
||||
}
|
||||
|
||||
function select(option,weight){
|
||||
disabled = false;
|
||||
selection[option.id] = +weight;
|
||||
}
|
||||
|
||||
onMount(load);
|
||||
</script>
|
||||
|
||||
<style>
|
||||
table td:nth-child(n+2) {
|
||||
text-align: center;
|
||||
}
|
||||
.radio {
|
||||
vertical-align: middle;
|
||||
}
|
||||
</style>
|
||||
|
||||
<fieldset>
|
||||
<legend>{t('User')}</legend>
|
||||
{#if user.name}
|
||||
<div>{t('logged in as: {user}',{user:user.name})}</div>
|
||||
{:else}
|
||||
<label>
|
||||
{t('Your name')}
|
||||
<input type="text" bind:value={editor.name} />
|
||||
</label>
|
||||
{/if}
|
||||
</fieldset>
|
||||
{#if poll}
|
||||
<fieldset>
|
||||
<legend>{t('poll')}: {poll.name}</legend>
|
||||
<div class="description">
|
||||
{@html poll.description.rendered}
|
||||
</div>
|
||||
<table class="poll">
|
||||
<thead>
|
||||
<tr>
|
||||
<td>{t('option')}</td>
|
||||
{#each Object.entries(poll.weights).sort((a,b) => a[0] - b[0]) as [weight,name]}
|
||||
<td class="weight">
|
||||
{weight}
|
||||
<span class="description">
|
||||
{name}
|
||||
</span>
|
||||
</td>
|
||||
{/each}
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{#each Object.entries(poll.options) as [option_id,option]}
|
||||
<tr>
|
||||
<td class="option">
|
||||
{option.name}
|
||||
<span class="description">
|
||||
{@html option.description.rendered}
|
||||
</span>
|
||||
</td>
|
||||
{#each Object.entries(poll.weights) as [weight,name]}
|
||||
<td class="radio" onclick={e => select(option,weight)} title={t('click to select')} >
|
||||
{#if selection[option_id] == weight}
|
||||
X
|
||||
{/if}
|
||||
</td>
|
||||
{/each}
|
||||
</tr>
|
||||
{/each}
|
||||
</tbody>
|
||||
</table>
|
||||
<button onclick={save} disabled={disabled || !editor.name || !Object.keys(selection).length}>{t('save')} </button>
|
||||
</fieldset>
|
||||
<div class="warn">TODO: add notes</div>
|
||||
<div class="warn">TODO: load previous selection for logged-in user</div>
|
||||
{/if}
|
||||
6
poll/build.gradle.kts
Normal file
6
poll/build.gradle.kts
Normal file
@@ -0,0 +1,6 @@
|
||||
description = "Umbrella : Polls"
|
||||
|
||||
dependencies{
|
||||
implementation(project(":core"))
|
||||
}
|
||||
|
||||
@@ -0,0 +1,11 @@
|
||||
/* © SRSoftware 2025 */
|
||||
package de.srsoftware.umbrella.poll;
|
||||
|
||||
public class Constants {
|
||||
public static final String CONFIG_DATABASE = "umbrella.modules.poll.database";
|
||||
public static final String TABLE_OPTIONS = "options";
|
||||
public static final String TABLE_POLLS = "polls";
|
||||
public static final String TABLE_SELECTIONS = "selections";
|
||||
public static final String TABLE_SHARES = "shares";
|
||||
public static final String TABLE_WEIGHTS = "weights";
|
||||
}
|
||||
24
poll/src/main/java/de/srsoftware/umbrella/poll/PollDb.java
Normal file
24
poll/src/main/java/de/srsoftware/umbrella/poll/PollDb.java
Normal file
@@ -0,0 +1,24 @@
|
||||
/* © SRSoftware 2025 */
|
||||
package de.srsoftware.umbrella.poll;
|
||||
|
||||
import de.srsoftware.umbrella.core.model.Permission;
|
||||
import de.srsoftware.umbrella.core.model.Poll;
|
||||
import de.srsoftware.umbrella.core.model.UmbrellaUser;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.Map;
|
||||
|
||||
public interface PollDb {
|
||||
Collection<Poll> listPolls(UmbrellaUser user);
|
||||
|
||||
Poll.Evaluation loadEvaluation(String id);
|
||||
|
||||
Poll loadPoll(String id);
|
||||
|
||||
Poll save(Poll poll);
|
||||
void saveSelection(Poll poll, Map<Integer,Integer> optionsToWeights, String guestName);
|
||||
|
||||
void saveSelection(Poll poll, Map<Integer,Integer> optionsToWeights, UmbrellaUser user);
|
||||
|
||||
void setPermission(String pollId, UmbrellaUser userId, Permission permission);
|
||||
}
|
||||
281
poll/src/main/java/de/srsoftware/umbrella/poll/PollModule.java
Normal file
281
poll/src/main/java/de/srsoftware/umbrella/poll/PollModule.java
Normal file
@@ -0,0 +1,281 @@
|
||||
/* © SRSoftware 2025 */
|
||||
package de.srsoftware.umbrella.poll;
|
||||
|
||||
import static de.srsoftware.umbrella.core.ConnectionProvider.connect;
|
||||
import static de.srsoftware.umbrella.core.ModuleRegistry.userService;
|
||||
import static de.srsoftware.umbrella.core.constants.Field.*;
|
||||
import static de.srsoftware.umbrella.core.constants.Path.*;
|
||||
import static de.srsoftware.umbrella.core.constants.Path.WEIGHT;
|
||||
import static de.srsoftware.umbrella.core.exceptions.UmbrellaException.*;
|
||||
import static de.srsoftware.umbrella.poll.Constants.CONFIG_DATABASE;
|
||||
import static java.lang.System.Logger.Level.WARNING;
|
||||
import static java.net.HttpURLConnection.HTTP_OK;
|
||||
import static java.text.MessageFormat.format;
|
||||
import static de.srsoftware.umbrella.core.model.Permission.READ_ONLY;
|
||||
import com.sun.net.httpserver.HttpExchange;
|
||||
import de.srsoftware.configuration.Configuration;
|
||||
import de.srsoftware.tools.Path;
|
||||
import de.srsoftware.tools.SessionToken;
|
||||
import de.srsoftware.umbrella.core.BaseHandler;
|
||||
import de.srsoftware.umbrella.core.ModuleRegistry;
|
||||
import de.srsoftware.umbrella.core.api.PollService;
|
||||
import de.srsoftware.umbrella.core.constants.Field;
|
||||
import de.srsoftware.umbrella.core.constants.Text;
|
||||
import de.srsoftware.umbrella.core.exceptions.UmbrellaException;
|
||||
import de.srsoftware.umbrella.core.model.Permission;
|
||||
import de.srsoftware.umbrella.core.model.Poll;
|
||||
import de.srsoftware.umbrella.core.model.Token;
|
||||
import de.srsoftware.umbrella.core.model.UmbrellaUser;
|
||||
import org.json.JSONObject;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.*;
|
||||
|
||||
public class PollModule extends BaseHandler implements PollService {
|
||||
|
||||
private PollDb pollDb;
|
||||
|
||||
public PollModule(Configuration config){
|
||||
super();
|
||||
var dbFile = config.get(CONFIG_DATABASE).orElseThrow(() -> missingField(CONFIG_DATABASE));
|
||||
pollDb = new SqliteDb(connect(dbFile));
|
||||
ModuleRegistry.add(this);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean doGet(Path path, HttpExchange ex) throws IOException {
|
||||
addCors(ex);
|
||||
try {
|
||||
Optional<Token> token = SessionToken.from(ex).map(Token::of);
|
||||
var head = path.pop();
|
||||
var user = userService().loadUser(token).orElse(null);
|
||||
return switch (head) {
|
||||
case EVALUATE -> getPollEvaluation(ex,user, path);
|
||||
case LIST -> getPollList(ex,user);
|
||||
case null -> super.doGet(path,ex);
|
||||
default -> getPoll(ex,user,head);
|
||||
};
|
||||
} catch (UmbrellaException e){
|
||||
return send(ex,e);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean doPatch(Path path, HttpExchange ex) throws IOException {
|
||||
addCors(ex);
|
||||
try {
|
||||
Optional<Token> token = SessionToken.from(ex).map(Token::of);
|
||||
var user = userService().loadUser(token);
|
||||
if (user.isEmpty()) return unauthorized(ex);
|
||||
var head = path.pop();
|
||||
return switch (head) {
|
||||
case null -> super.doPatch(path,ex);
|
||||
default -> patchPoll(ex,user.get(),head, path);
|
||||
};
|
||||
} catch (UmbrellaException e){
|
||||
return send(ex,e);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean doPost(Path path, HttpExchange ex) throws IOException {
|
||||
addCors(ex);
|
||||
try {
|
||||
Optional<Token> token = SessionToken.from(ex).map(Token::of);
|
||||
var user = userService().loadUser(token).orElse(null );
|
||||
var head = path.pop();
|
||||
return switch (head) {
|
||||
case null -> postNewPoll(ex,user);
|
||||
default -> postToPoll(ex, user, head, path);
|
||||
};
|
||||
} catch (UmbrellaException e){
|
||||
return send(ex,e);
|
||||
}
|
||||
}
|
||||
|
||||
private boolean getPoll(HttpExchange ex, UmbrellaUser user, String pollId) throws IOException {
|
||||
var poll = pollDb.loadPoll(pollId);
|
||||
var permitted = !poll.isPrivate() || poll.owner().equals(user);
|
||||
if (!permitted && poll.permissions().get(user) == null) throw forbidden(Text.NOT_ALLOWED_TO_EDIT, Field.OBJECT,Text.POLL);
|
||||
var eval = pollDb.loadEvaluation(pollId);
|
||||
return sendContent(ex,poll);
|
||||
}
|
||||
|
||||
private boolean getPollEvaluation(HttpExchange ex, UmbrellaUser user, Path path) throws IOException {
|
||||
if (user == null) return unauthorized(ex);
|
||||
if (path.empty()) throw missingField(ID);
|
||||
var poll = pollDb.loadPoll(path.pop());
|
||||
if (!poll.owner().equals(user)) {
|
||||
switch (poll.permissions().get(user)) {
|
||||
case Permission.EDIT:
|
||||
case Permission.OWNER:
|
||||
break;
|
||||
case null, default:
|
||||
throw forbidden(Text.NOT_ALLOWED_TO_EVALUATE, Field.OBJECT, Text.POLL);
|
||||
}
|
||||
}
|
||||
var result = new HashMap<>(poll.toMap());
|
||||
var evaluation = pollDb.loadEvaluation(poll.id());
|
||||
result.put(Field.EVALUATION,evaluation.toMap());
|
||||
return sendContent(ex,result);
|
||||
}
|
||||
|
||||
private boolean getPollList(HttpExchange ex, UmbrellaUser user) throws IOException {
|
||||
if (user == null) return unauthorized(ex);
|
||||
var list = pollDb.listPolls(user).stream().map(Poll::toMap);
|
||||
return sendContent(ex,list);
|
||||
}
|
||||
|
||||
private boolean patchPoll(HttpExchange ex, UmbrellaUser user, String pollId, Path path) throws IOException {
|
||||
var poll = pollDb.loadPoll(pollId);
|
||||
var permitted = poll.owner().equals(user);
|
||||
if (!permitted && !Set.of(Permission.EDIT, Permission.OWNER).contains(poll.permissions().get(user))) throw forbidden(Text.NOT_ALLOWED_TO_EDIT, Field.OBJECT,Text.POLL);
|
||||
|
||||
var head = path.pop();
|
||||
return switch (head){
|
||||
case null -> patchPoll(ex, poll);
|
||||
case OPTION -> patchPollOptions(ex, path, poll);
|
||||
case WEIGHT -> patchWeights(ex, poll);
|
||||
default -> notFound(ex);
|
||||
};
|
||||
}
|
||||
|
||||
private boolean patchPoll(HttpExchange ex, Poll poll) throws IOException {
|
||||
var json = json(ex);
|
||||
for (var key : json.keySet()){
|
||||
switch (key){
|
||||
case Field.DESCRIPTION:
|
||||
poll.description(json.getString(key)); break;
|
||||
case Field.NAME:
|
||||
poll.name(json.getString(key)); break;
|
||||
case PRIVATE:
|
||||
poll.setPrivate(json.getBoolean(key)); break;
|
||||
case null, default:
|
||||
throw UmbrellaException.badRequest(Text.UNKNOWN_FIELD,ID,key);
|
||||
}
|
||||
}
|
||||
return sendContent(ex,pollDb.save(poll));
|
||||
}
|
||||
|
||||
private boolean patchWeights(HttpExchange ex, Poll poll) throws IOException {
|
||||
var json = json(ex);
|
||||
for (var key : json.keySet()) try {
|
||||
var weight = Integer.parseInt(key);
|
||||
if (!(json.get(key) instanceof String description)) throw invalidField(Field.DESCRIPTION,Text.STRING);
|
||||
poll.setWeight(weight,description);
|
||||
} catch (NumberFormatException nfe) {
|
||||
throw invalidField(Text.WEIGHT,Text.NUMBER);
|
||||
}
|
||||
return sendContent(ex,pollDb.save(poll));
|
||||
}
|
||||
|
||||
private boolean patchPollOptions(HttpExchange ex, Path path, Poll poll) throws IOException {
|
||||
try {
|
||||
if (path.empty()) throw missingField(ID);
|
||||
var optionId = Integer.parseInt(path.pop());
|
||||
var option = poll.options().stream().filter(o -> o.id()==optionId).findFirst().orElse(null);
|
||||
if (option == null) throw failedToLoadObject(Text.OPTION);
|
||||
var json = json(ex);
|
||||
for (var key : json.keySet()){
|
||||
switch (key) {
|
||||
case ID:
|
||||
break;
|
||||
case Field.NAME:
|
||||
option.name(json.getString(key)); break;
|
||||
case Field.DESCRIPTION:
|
||||
option.description(json.getString(key)); break;
|
||||
default:
|
||||
throw UmbrellaException.badRequest(Text.UNKNOWN_FIELD,FIELD,key);
|
||||
}
|
||||
}
|
||||
|
||||
return sendContent(ex, pollDb.save(poll));
|
||||
} catch (NumberFormatException nfe){
|
||||
throw invalidField(ID,Text.NUMBER).causedBy(nfe);
|
||||
}
|
||||
}
|
||||
|
||||
private boolean postNewPoll(HttpExchange ex, UmbrellaUser user) throws IOException {
|
||||
if (user == null) return unauthorized(ex);
|
||||
var json = json(ex);
|
||||
if (!json.has(Field.NAME)) throw missingField(Field.NAME);
|
||||
var name = json.getString(Field.NAME);
|
||||
var poll = new Poll(null,user,name,"",true, List.of(), Map.of());
|
||||
return sendContent(ex,pollDb.save(poll));
|
||||
}
|
||||
|
||||
private boolean postToPoll(HttpExchange ex, UmbrellaUser user, String id, Path path) throws IOException {
|
||||
var head = path.pop();
|
||||
var poll = pollDb.loadPoll(id);
|
||||
if (SELECT.equals(head)) {
|
||||
if (user == null && poll.isPrivate()) return unauthorized(ex);
|
||||
return postSelection(ex, poll, null);
|
||||
}
|
||||
var permitted = poll.owner().equals(user);
|
||||
if (!permitted && !Set.of(Permission.OWNER, Permission.EDIT).contains(poll.permissions().get(user))) throw forbidden(Text.NOT_ALLOWED_TO_EDIT, Field.OBJECT,Text.POLL);
|
||||
return switch (head){
|
||||
case PERMISSIONS -> postPermission(ex, poll, user);
|
||||
case OPTION -> postOption(ex, poll);
|
||||
case null, default -> notFound(ex);
|
||||
};
|
||||
}
|
||||
|
||||
private boolean postPermission(HttpExchange ex, Poll poll, UmbrellaUser user) throws IOException {
|
||||
LOG.log(WARNING,"Permission check not implemented for postPermission");
|
||||
|
||||
var json = json(ex);
|
||||
if (!json.has(USER_ID)) throw missingField(USER_ID);
|
||||
if (!json.has(PERMISSION)) throw missingField(PERMISSION);
|
||||
if (!(json.get(USER_ID) instanceof Number userId)) throw invalidField(USER_ID,NUMBER);
|
||||
if (!(json.get(PERMISSION) instanceof Number perm)) throw invalidField(PERMISSION,NUMBER);
|
||||
var modifiedUser = userService().loadUser(userId.longValue());
|
||||
if (perm.intValue() == 0){
|
||||
pollDb.setPermission(poll.id(), modifiedUser, null);
|
||||
return sendEmptyResponse(HTTP_OK,ex);
|
||||
}
|
||||
var permission = Permission.of(perm.intValue());
|
||||
if (permission == Permission.ASSIGNEE) permission = Permission.EDIT;
|
||||
pollDb.setPermission(poll.id(), modifiedUser, permission);
|
||||
return sendContent(ex,Map.of(
|
||||
Field.USER,modifiedUser.toMap(),
|
||||
PERMISSION, permission.toMap()
|
||||
));
|
||||
}
|
||||
|
||||
private boolean postSelection(HttpExchange ex, Poll poll, UmbrellaUser user) throws IOException {
|
||||
var json = json(ex);
|
||||
if (!json.has(Field.SELECTION)) throw missingField(Field.SELECTION);
|
||||
if (!(json.get(Field.SELECTION) instanceof JSONObject job)) throw invalidField(Field.SELECTION,JSON);
|
||||
var map = new HashMap<Integer,Integer>();
|
||||
for (var key : job.keySet()){
|
||||
var optionId = Integer.parseInt(key);
|
||||
if (!(job.get(key) instanceof Integer weight)) throw invalidField(Field.WEIGHT,Text.NUMBER);
|
||||
map.put(optionId,weight);
|
||||
}
|
||||
if (user == null) {
|
||||
if (!json.has(Field.EDITOR)) throw missingField(Field.EDITOR);
|
||||
if (!(json.get(Field.EDITOR) instanceof JSONObject editor)) throw invalidField(Field.EDITOR,JSON);
|
||||
if (!editor.has(Field.NAME)) throw missingField(format("{0}.{1}}",Field.EDITOR,Field.NAME));
|
||||
if (!(editor.get(Field.NAME) instanceof String name)) throw invalidField(format("{0}.{1}",Field.EDITOR,Field.NAME),Text.STRING);
|
||||
pollDb.saveSelection(poll, map, name);
|
||||
} else pollDb.saveSelection(poll, map, user);
|
||||
return sendContent(ex,poll);
|
||||
}
|
||||
|
||||
private boolean postOption(HttpExchange ex, Poll poll) throws IOException {
|
||||
var json = json(ex);
|
||||
if (!json.has(Field.NAME) || !(json.get(Field.NAME) instanceof String name)) throw missingField(Field.NAME);
|
||||
String description = null;
|
||||
if (json.has(Field.DESCRIPTION)) {
|
||||
var val = json.get(Field.DESCRIPTION);
|
||||
if (val instanceof JSONObject j && j.has(Field.SOURCE)) val = j.get(Field.SOURCE);
|
||||
if (val instanceof String d) description = d;
|
||||
}
|
||||
var options = poll.options();
|
||||
int newId = options.stream().map(Poll.Option::id).max(Integer::compareTo).orElse(0) + 1;
|
||||
|
||||
var option = new Poll.Option(0, name, description, 0).id(newId);
|
||||
poll.options().add(option);
|
||||
return sendContent(ex,pollDb.save(poll));
|
||||
}
|
||||
}
|
||||
299
poll/src/main/java/de/srsoftware/umbrella/poll/SqliteDb.java
Normal file
299
poll/src/main/java/de/srsoftware/umbrella/poll/SqliteDb.java
Normal file
@@ -0,0 +1,299 @@
|
||||
/* © SRSoftware 2025 */
|
||||
package de.srsoftware.umbrella.poll;
|
||||
|
||||
import static de.srsoftware.tools.Optionals.is0;
|
||||
import static de.srsoftware.tools.jdbc.Condition.equal;
|
||||
import static de.srsoftware.tools.jdbc.Query.*;
|
||||
import static de.srsoftware.tools.jdbc.Query.SelectQuery.ALL;
|
||||
import static de.srsoftware.umbrella.core.ModuleRegistry.userService;
|
||||
import static de.srsoftware.umbrella.core.constants.Field.*;
|
||||
import static de.srsoftware.umbrella.core.constants.Field.DESCRIPTION;
|
||||
import static de.srsoftware.umbrella.core.exceptions.UmbrellaException.*;
|
||||
import static de.srsoftware.umbrella.poll.Constants.*;
|
||||
import static java.text.MessageFormat.format;
|
||||
|
||||
import de.srsoftware.umbrella.core.BaseDb;
|
||||
import de.srsoftware.umbrella.core.constants.Field;
|
||||
import de.srsoftware.umbrella.core.constants.Text;
|
||||
import de.srsoftware.umbrella.core.exceptions.UmbrellaException;
|
||||
import de.srsoftware.umbrella.core.model.Permission;
|
||||
import de.srsoftware.umbrella.core.model.Poll;
|
||||
import de.srsoftware.umbrella.core.model.UmbrellaUser;
|
||||
|
||||
import java.sql.Connection;
|
||||
import java.sql.SQLException;
|
||||
import java.util.*;
|
||||
|
||||
public class SqliteDb extends BaseDb implements PollDb {
|
||||
|
||||
public SqliteDb(Connection connection) {
|
||||
super(connection);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected int createTables() {
|
||||
var version = createSettingsTable();
|
||||
switch (version){
|
||||
case 0:
|
||||
createPollsTable();
|
||||
createOptionsTable();
|
||||
createWeightsTable();
|
||||
createSelectionsTable();
|
||||
case 1:
|
||||
createSharesTable();
|
||||
}
|
||||
return setCurrentVersion(2);
|
||||
}
|
||||
|
||||
private void createOptionsTable() {
|
||||
var sql = "CREATE TABLE IF NOT EXISTS {0} ({1} INT NOT NULL, {2} VARCHAR(255) NOT NULL REFERENCES {3}({1}), {4} VARCHAR(255) NOT NULL, {5} TEXT, {6} INT DEFAULT 0, PRIMARY KEY ({1}, {2}))";
|
||||
try {
|
||||
var stmt = db.prepareStatement(format(sql,TABLE_OPTIONS, Field.ID,Field.POLL_ID,TABLE_POLLS,Field.NAME, Field.DESCRIPTION, Field.STATUS));
|
||||
stmt.execute();
|
||||
stmt.close();
|
||||
} catch (SQLException e) {
|
||||
throw failedToCreateTable(TABLE_OPTIONS).causedBy(e);
|
||||
}
|
||||
}
|
||||
|
||||
private void createPollsTable() {
|
||||
var sql = "CREATE TABLE IF NOT EXISTS {0} ({1} VARCHAR(255) NOT NULL PRIMARY KEY, {2} INT NOT NULL, {3} VARCHAR(255) NOT NULL, {4} TEXT, {5} BOOLEAN)";
|
||||
try {
|
||||
var stmt = db.prepareStatement(format(sql,TABLE_POLLS, Field.ID,Field.USER_ID,Field.NAME,Field.DESCRIPTION, Field.PRIVATE));
|
||||
stmt.execute();
|
||||
stmt.close();
|
||||
} catch (SQLException e) {
|
||||
throw failedToCreateTable(TABLE_POLLS).causedBy(e);
|
||||
}
|
||||
}
|
||||
|
||||
private void createSelectionsTable() {
|
||||
var sql = """
|
||||
CREATE TABLE IF NOT EXISTS {0} (
|
||||
{1} VARCHAR(255) NOT NULL,
|
||||
{2} INT NOT NULL,
|
||||
{3} INT NOT NULL,
|
||||
{4} INT NOT NULL,
|
||||
FOREIGN KEY ({1}) REFERENCES {5}({7}),
|
||||
FOREIGN KEY ({1},{2}) REFERENCES {6}({1}, {7}),
|
||||
FOREIGN KEY ({1}, {4}) REFERENCES {8}({1}, {4}),
|
||||
PRIMARY KEY ({1}, {2}, {3}))""";
|
||||
try {
|
||||
var stmt = db.prepareStatement(format(sql,
|
||||
TABLE_SELECTIONS,
|
||||
POLL_ID, OPTION_ID, USER_ID, Field.WEIGHT,
|
||||
TABLE_POLLS, TABLE_OPTIONS, ID, TABLE_WEIGHTS));
|
||||
stmt.execute();
|
||||
stmt.close();
|
||||
} catch (SQLException e) {
|
||||
throw failedToCreateTable(TABLE_SELECTIONS).causedBy(e);
|
||||
}
|
||||
}
|
||||
|
||||
private void createSharesTable() {
|
||||
var sql = "CREATE TABLE IF NOT EXISTS {0} ({1} VARCHAR(255) NOT NULL REFERENCES {2}({3}), {4} INT NOT NULL, {5} INT, PRIMARY KEY ({1}, {4}))";
|
||||
try {
|
||||
var stmt = db.prepareStatement(format(sql,TABLE_SHARES,POLL_ID,TABLE_POLLS,ID,USER_ID, PERMISSION));
|
||||
stmt.execute();
|
||||
stmt.close();
|
||||
} catch (SQLException e) {
|
||||
throw failedToCreateTable(TABLE_SHARES).causedBy(e);
|
||||
}
|
||||
}
|
||||
|
||||
private void createWeightsTable(){
|
||||
var sql = "CREATE TABLE IF NOT EXISTS {0} ( {1} INT NOT NULL, {2} VARCHAR(255) NOT NULL REFERENCES {3}({4}), {5} TEXT, PRIMARY KEY ({2}, {1}))";
|
||||
try {
|
||||
var stmt = db.prepareStatement(format(sql,TABLE_WEIGHTS, WEIGHT,POLL_ID,TABLE_POLLS, ID, DESCRIPTION));
|
||||
stmt.execute();
|
||||
stmt.close();
|
||||
} catch (SQLException e) {
|
||||
throw failedToCreateTable(TABLE_WEIGHTS).causedBy(e);
|
||||
}
|
||||
}
|
||||
|
||||
private void dropWeight(Poll poll, int weight){
|
||||
try {
|
||||
delete().from(TABLE_WEIGHTS).where(POLL_ID, equal(poll.id())).where(WEIGHT, equal(weight)).execute(db);
|
||||
poll.weights().remove(weight);
|
||||
} catch (SQLException e){
|
||||
throw failedToDropObject(Text.WEIGHT);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public Collection<Poll> listPolls(UmbrellaUser user) {
|
||||
try {
|
||||
var sql = "SELECT DISTINCT {0}.*, {5} FROM {0} LEFT JOIN {1} ON {0}.{2} = {1}.{4} WHERE {0}.{7} IS FALSE OR {0}.{3} = ? OR {1}.{3} = ? ORDER BY {6} ASC;";
|
||||
var ps = db.prepareStatement(format(sql,TABLE_POLLS,TABLE_SHARES, ID, USER_ID, POLL_ID, PERMISSION, NAME, PRIVATE));
|
||||
ps.setLong(1,user.id());
|
||||
ps.setLong(2, user.id());
|
||||
var rs = ps.executeQuery();
|
||||
var list = new ArrayList<Poll>();
|
||||
while (rs.next()) {
|
||||
var poll = Poll.of(rs);
|
||||
var perm = rs.getInt(PERMISSION);
|
||||
if (perm != 0) poll.permissions().put(user,Permission.of(perm));
|
||||
list.add(poll);
|
||||
}
|
||||
rs.close();
|
||||
return list;
|
||||
} catch (SQLException sqle){
|
||||
throw failedToLoadObject(TABLE_POLLS);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public Poll.Evaluation loadEvaluation(String pollId) {
|
||||
try {
|
||||
var result = new Poll.Evaluation();
|
||||
var rs = select(ALL).from(TABLE_SELECTIONS).where(POLL_ID,equal(pollId)).exec(db);
|
||||
while (rs.next()) result.count(rs);
|
||||
rs.close();
|
||||
return result;
|
||||
} catch (SQLException e) {
|
||||
throw failedToLoadObject(Text.EVALUATION);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public Poll loadPoll(String id) {
|
||||
try {
|
||||
var rs = select(ALL).from(TABLE_POLLS).where(ID,equal(id)).exec(db);
|
||||
Poll poll = null;
|
||||
if (rs.next()) poll = Poll.of(rs);
|
||||
rs.close();
|
||||
if (poll == null) throw failedToLoadObject(Text.POLL,id);
|
||||
|
||||
rs = select(ALL).from(TABLE_OPTIONS).where(POLL_ID,equal(id)).exec(db);
|
||||
while (rs.next()) poll.options().add(Poll.Option.of(rs));
|
||||
rs.close();
|
||||
|
||||
rs = select(ALL).from(TABLE_WEIGHTS).where(POLL_ID,equal(id)).sort(WEIGHT+" ASC").exec(db);
|
||||
while (rs.next()) {
|
||||
var weight = rs.getInt(WEIGHT);
|
||||
var descr = rs.getString(DESCRIPTION);
|
||||
poll.weights().put(weight,descr);
|
||||
}
|
||||
rs.close();
|
||||
|
||||
rs = select(ALL).from(TABLE_SHARES).where(POLL_ID,equal(id)).exec(db);
|
||||
var permissions = new HashMap<Long,Permission>();
|
||||
while (rs.next()) permissions.put(rs.getLong(USER_ID),Permission.of(rs.getInt(PERMISSION)));
|
||||
rs.close();
|
||||
if (!permissions.isEmpty()) {
|
||||
var users = userService().list(null, null, permissions.keySet());
|
||||
for (var entry : users.entrySet()) poll.permissions().put(entry.getValue(), permissions.get(entry.getKey()));
|
||||
}
|
||||
return poll;
|
||||
} catch (SQLException e) {
|
||||
throw failedToLoadObject(Text.POLL,id).causedBy(e);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public Poll save(Poll poll) {
|
||||
return is0(poll.id()) ? saveNew(poll) : update(poll);
|
||||
}
|
||||
|
||||
public Poll.Option saveOption(String pollId, Poll.Option option) {
|
||||
try {
|
||||
if (option.isNew()) return saveNew(pollId,option);
|
||||
if (option.isDirty()) return update(pollId, option);
|
||||
return option;
|
||||
} catch (SQLException e){
|
||||
throw failedToStoreObject(Text.OPTION);
|
||||
}
|
||||
}
|
||||
|
||||
private Poll saveNew(Poll poll) {
|
||||
var uuid = UUID.randomUUID().toString();
|
||||
try {
|
||||
insertInto(TABLE_POLLS,Field.ID, USER_ID, NAME, DESCRIPTION, PRIVATE)
|
||||
.values(uuid,poll.owner().id(),poll.name(),poll.description(),poll.isPrivate())
|
||||
.execute(db).close();
|
||||
} catch (SQLException e) {
|
||||
throw failedToStoreObject(poll);
|
||||
}
|
||||
return new Poll(uuid,poll.owner(),poll.name(),poll.description(),poll.isPrivate(), List.of(), Map.of());
|
||||
}
|
||||
|
||||
private Poll.Option saveNew(String pollId, Poll.Option option) throws SQLException {
|
||||
insertInto(TABLE_OPTIONS, ID, POLL_ID, NAME, DESCRIPTION, STATUS)
|
||||
.values(option.id(), pollId, option.name(), option.description(), option.status())
|
||||
.execute(db).close();
|
||||
return option;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void saveSelection(Poll poll, Map<Integer, Integer> optionsToWeights, String guestName) {
|
||||
saveSelection(poll.id(), optionsToWeights, guestName);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void saveSelection(Poll poll, Map<Integer, Integer> optionsToWeights, UmbrellaUser user) {
|
||||
saveSelection(poll.id(), optionsToWeights, user.id());
|
||||
}
|
||||
|
||||
private void saveSelection(String pollId, Map<Integer, Integer> optionsToWeights, Object editor) {
|
||||
|
||||
var query = replaceInto(TABLE_SELECTIONS,POLL_ID,OPTION_ID,USER_ID,WEIGHT);
|
||||
for (var entry : optionsToWeights.entrySet()){
|
||||
var optionId = entry.getKey();
|
||||
var weight = entry.getValue();
|
||||
query.values(pollId,optionId,editor,weight);
|
||||
}
|
||||
try {
|
||||
query.execute(db).close();
|
||||
} catch (SQLException sqle){
|
||||
throw UmbrellaException.failedToStoreObject(Text.SELECTIONS);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setPermission(String pollId, UmbrellaUser user, Permission permission) {
|
||||
try {
|
||||
if (permission == null){
|
||||
delete().from(TABLE_SHARES).where(POLL_ID,equal(pollId)).where(USER_ID,equal(user.id())).execute(db);
|
||||
} else replaceInto(TABLE_SHARES, POLL_ID, USER_ID, PERMISSION)
|
||||
.values(pollId, user.id(), permission.code()).execute(db).close();
|
||||
} catch (SQLException e) {
|
||||
throw failedToStoreObject(Text.PERMISSION);
|
||||
}
|
||||
}
|
||||
|
||||
private Poll update(Poll poll) {
|
||||
if (poll.isDirty(NAME, DESCRIPTION,PRIVATE)) try {
|
||||
replaceInto(TABLE_POLLS,ID,Field.USER_ID,NAME,DESCRIPTION,PRIVATE).values(poll.id(),poll.owner().id(),poll.name(),poll.description(),poll.isPrivate()).execute(db).close();
|
||||
} catch (SQLException e){
|
||||
throw failedToStoreObject(poll);
|
||||
}
|
||||
if (poll.isDirty(WEIGHTS)) try {
|
||||
Map.copyOf(poll.weights())
|
||||
.entrySet().stream()
|
||||
.filter(entry -> entry.getValue().isBlank())
|
||||
.map(Map.Entry::getKey)
|
||||
.forEach(w -> dropWeight(poll,w));
|
||||
var query = replaceInto(TABLE_WEIGHTS, POLL_ID, WEIGHT, DESCRIPTION);
|
||||
for (var entry : poll.weights().entrySet()){
|
||||
query.values(poll.id(),entry.getKey(),entry.getValue());
|
||||
}
|
||||
query.execute(db).close();
|
||||
} catch (SQLException e) {
|
||||
throw failedToStoreObject(poll);
|
||||
}
|
||||
for (var option : poll.options()) saveOption(poll.id(),option);
|
||||
return poll;
|
||||
}
|
||||
|
||||
private Poll.Option update(String pollId, Poll.Option option) throws SQLException {
|
||||
if (option.name().isBlank()){
|
||||
delete().from(TABLE_OPTIONS).where(POLL_ID,equal(pollId)).where(ID,equal(option.id())).execute(db);
|
||||
return null;
|
||||
}
|
||||
replaceInto(TABLE_OPTIONS,POLL_ID, ID, NAME, DESCRIPTION, STATUS)
|
||||
.values(pollId, option.id(), option.name(), option.description(), option.status()).execute(db).close();
|
||||
return option;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -5,6 +5,7 @@ import static de.srsoftware.umbrella.core.ConnectionProvider.connect;
|
||||
import static de.srsoftware.umbrella.core.ModuleRegistry.*;
|
||||
import static de.srsoftware.umbrella.core.Util.mapValues;
|
||||
import static de.srsoftware.umbrella.core.constants.Field.*;
|
||||
import static de.srsoftware.umbrella.core.constants.Field.PERMISSION;
|
||||
import static de.srsoftware.umbrella.core.constants.Field.SETTINGS;
|
||||
import static de.srsoftware.umbrella.core.constants.Field.TAGS;
|
||||
import static de.srsoftware.umbrella.core.constants.Module.PROJECT;
|
||||
|
||||
@@ -8,10 +8,12 @@ include("contact")
|
||||
include("core")
|
||||
include("documents")
|
||||
include("files")
|
||||
include("journal")
|
||||
include("legacy")
|
||||
include("messages")
|
||||
include("markdown")
|
||||
include("notes")
|
||||
include("poll")
|
||||
include("project")
|
||||
include("stock")
|
||||
include("tags")
|
||||
@@ -22,4 +24,3 @@ include("user")
|
||||
include("web")
|
||||
include("wiki")
|
||||
|
||||
include("journal")
|
||||
@@ -196,6 +196,7 @@
|
||||
"locality": "Ort",
|
||||
"location": "Ort",
|
||||
"locations": "Orte",
|
||||
"logged in as: {user}": "Anegemeldet als: {user}",
|
||||
"login" : "Anmeldung",
|
||||
"login service": "Login-Service",
|
||||
"login_services": "Login-Services",
|
||||
|
||||
@@ -196,6 +196,7 @@
|
||||
"locality": "locality",
|
||||
"location": "location",
|
||||
"locations": "locations",
|
||||
"logged in as: {user}": "logged in as: {user}",
|
||||
"login" : "login",
|
||||
"login service": "login service",
|
||||
"login_services": "login service",
|
||||
|
||||
Reference in New Issue
Block a user