From f874df35805d104173b27effad1ddef174ae5e06 Mon Sep 17 00:00:00 2001 From: armored-dragon Date: Wed, 4 Sep 2024 13:54:59 -0500 Subject: [PATCH 01/50] Initial commit. --- applications/metadata.js | 9 + applications/voting/img/icon_black.png | Bin 0 -> 521 bytes applications/voting/img/icon_white.png | Bin 0 -> 511 bytes applications/voting/vote.js | 275 +++++++++++ applications/voting/vote.qml | 655 +++++++++++++++++++++++++ 5 files changed, 939 insertions(+) create mode 100644 applications/voting/img/icon_black.png create mode 100644 applications/voting/img/icon_white.png create mode 100644 applications/voting/vote.js create mode 100644 applications/voting/vote.qml diff --git a/applications/metadata.js b/applications/metadata.js index 2398a11..c530809 100644 --- a/applications/metadata.js +++ b/applications/metadata.js @@ -341,6 +341,15 @@ var metadata = { "applications": "jsfile": "hmd3rdPerson/app-hmd3rdPerson.js", "icon": "hmd3rdPerson/icon_inactive_white.png", "caption": "3rd PERS" + }, + { + "isActive": true, + "directory": "voting", + "name": "General Assembly Voting", + "description": "Vote in the General Assembly", + "jsfile": "voting/vote.js", + "icon": "voting/icon_white.png", + "caption": "VOTE" } ] }; \ No newline at end of file diff --git a/applications/voting/img/icon_black.png b/applications/voting/img/icon_black.png new file mode 100644 index 0000000000000000000000000000000000000000..b62d59774686a43d1f07bf0d0f208aa5cd8fdf98 GIT binary patch literal 521 zcmeAS@N?(olHy`uVBq!ia0y~yU@!t<4mJh`208nVjSLJ7oCO|{#S9GG!XV7ZFl&wk z0|Ns~x}&cn1H;C?n%{ww85kH8l0AZa85pWm85kOx85n;4XJBY}$-q!*z`*b-fq}tl z1_Oh5{-pS$ZVU{J^`0({Ar-fh{`~)Mf4G2wf$<2Fl7ysW=SN;;F~h3Yhq)XkG732O z@Em4gV7aj2BZmV6uXI1r%#9On$tY}>bX2XiV02*Moh`x0u^{oWU;{&vUFq-7pFbO#5lx%x%KQoK-nK(#Y!-3=_tmGH$5og7^-*{|6gC zV_?d-aRkjVA+M*uVo+#^crm9jGt7X2ML^d}*Uf4+`!^K_hKq~8dW$m%IBZ$t{_nDt zrD8G2fGJThE0JtRXS$rOYFQyQGfI~Q=F}^BfB!8n^ANu6#K562&2ieC6W?q=o?F6- z;thyF6COu}y!B*axv-&Auz^9ULt>%lcL{|CiT2Znj2jr384~ps8vA#hYh_?yVDNPH Kb6Mw<&;$To>7oe$ literal 0 HcmV?d00001 diff --git a/applications/voting/img/icon_white.png b/applications/voting/img/icon_white.png new file mode 100644 index 0000000000000000000000000000000000000000..e765410b50e836051e64a1064681bbc9504db3a9 GIT binary patch literal 511 zcma)2&nrW50RO!2o_V&$(}Wi5)r)tb{K`S(O~ZDu7!H0ELm4R|wU&5@-twy`$*-1> zA5m(501d6g$pIG!F5`fNgr*kPfX-?$+W}-KVAKGN`SK2c zhz?6t7ogQEpfEch4}fkqm6(8?@t(J`DF9rf#a;rqlK^QDcntwk5a><=Zt8)Y86d8G zvhJV=pt`MQQ-$lI;XM?}_jdr)K3VZR==j)l_pLtyMD{plAi% zcb_XlH@6(7Xy;2`>tTYTCp4D8zP$RFu{sIzKnu$hwxohzSz19okq4a)G(m-GXj(P^Tlw+>zMNW zn(<|%?yMcz$g?V6r4v?EMe|ufql#vaN^Q0PxLw?(8044@AqN1gg*NkcLH)odCy<&b literal 0 HcmV?d00001 diff --git a/applications/voting/vote.js b/applications/voting/vote.js new file mode 100644 index 0000000..4d4c60b --- /dev/null +++ b/applications/voting/vote.js @@ -0,0 +1,275 @@ +// +// vote.js +// +// App to simplify the tallying of votes for Community Meetings +// +// Created by Armored Dragon, 2024. +// Copyright 2024 Overte e.V. +// +// Distributed under the Apache License, Version 2.0. +// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html + +/* global Script Tablet Messages MyAvatar Uuid*/ + +// TODO: Documentation +// TODO: Start poll +// TODO: View active polls +// TODO: Join poll +// TODO: Create poll question and answers +// TODO: Create pre-fill answers (checkbox?) +// TODO: Save questions and answers locally +// TODO: View previous answers + +(() => { + "use strict"; + var tablet; + var appButton; + var active = false; + var poll = {id: '', title: '', description: '', host: '', question: '', options: []}; + var receivedPolls = []; // List of poll ids received. + const url = Script.resolvePath("./vote.qml"); + const myUuid = generateUUID(MyAvatar.sessionUUID); + Messages.messageReceived.connect(receivedMessage); + Messages.subscribe('ga-polls'); + + tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system"); + appButton = tablet.addButton({ + icon: Script.resolvePath("./img/icon_white.png"), + activeIcon: Script.resolvePath("./img/icon_black.png"), + text: "VOTE", + isActive: active, + }); + + // When script ends, remove itself from tablet + Script.scriptEnding.connect(function () { + console.log("Shutting Down"); + tablet.removeButton(appButton); + }); + + // Overlay button toggle + appButton.clicked.connect(toolbarButtonClicked); + tablet.fromQml.connect(fromQML); + tablet.screenChanged.connect(onTabletScreenChanged); + + function toolbarButtonClicked() { + if (active) tablet.gotoHomeScreen(); + else tablet.loadQMLSource(url); + + active = !active; + appButton.editProperties({ + isActive: active, + }); + } + + function onTabletScreenChanged(type, newUrl) { + if (url == newUrl) { + active = true; + + // TODO: Is this needed? + // If we are connected to a poll already, repopulate the screen + // if (poll.id != '') return populateScreen(); + + // Request a list of active polls if we are not already in one + if (poll.id == '') return getActivePolls(); + } + else active = false; + + appButton.editProperties({ + isActive: active, + }); + } + + // Functions + + // Get a list of active polls + function getActivePolls() { + // Sends a message to all hosts to send a list of their polls + Messages.sendMessage('ga-polls', JSON.stringify({type: "populate"})); + } + + // Create a new poll for others to join + function createPoll(pollInformation) { + console.log("Creating a new poll"); + // Check if we are already hosting a poll + if (poll.id != '') return; + + // Set our active poll data + poll.id = generateUUID(); + poll.host = myUuid; + poll.title = pollInformation.title; + poll.description = pollInformation.description; + console.log(`Active poll set as:\nid:${poll.id}\ntitle:${poll.title}\ndescription:${poll.description}`); + + // Send message to all clients + Messages.sendMessage("ga-polls", JSON.stringify({type: "active_poll", poll: poll})); + console.log("Broadcasted poll to server"); + + // Subscribe to our own messages + Messages.subscribe(poll.id); + + // Update the UI screen + _emitEvent({type: "create_poll"}); + } + + // Closes the poll and return to the main menu + function deletePoll(){ + // Check to see if we are hosting the poll + if (poll.host != myUuid) return; // We are not the host of this poll + + console.log("Closing active poll"); + + // Submit the termination message to all clients + Messages.sendMessage("ga-polls", JSON.stringify({type: "close_poll"})); + + // Clear our active poll data + poll = { host: '', title: '', description: '', id: '', question: '', options: []}; + + // Update the UI screen + _emitEvent({type: "close_poll"}); + } + + // Join an existing poll hosted by another user + function joinPoll(pollToJoin){ + // TODO: Check if poll even exists + + // Leave poll if already connected to one + leavePoll(); + + // Save the poll information + poll = pollToJoin; + + // Subscribe to message mixer for poll information + Messages.subscribe(pollToJoin.id); + + // Send join notice to server. This will cause the host to (re)emit the current poll to the server + Messages.sendMessage(pollToJoin.id, JSON.stringify({type: "join"})); + + // Log the successful join + console.log(`Successfully joined ${poll.id}`); + } + + // Leave a poll hosted by another user + function leavePoll() { + let pollToLeave = poll.id; + + // Unsubscribe from message mixer for poll information + Messages.unsubscribe(poll.id); + + // Clear poll + poll = {id: '', host: ''}; + + console.log(`Successfully left ${pollToLeave}`); + } + + // Cast a vote on a poll + function castVote(event) { + console.log(`Casting vote to ${poll.id}: ${event}`); + + // Check if poll is valid + if (poll == undefined || poll.id == '') return; + + // Send vote to server + Messages.sendMessage(poll.id, JSON.stringify({type: "vote", option: event.option})); + } + + // Emit the prompt question and options to the server + function emitPrompt(){ + if (poll.host != myUuid) return; // We are not the host of this poll + + console.log(`Emitting prompt`); + Messages.sendMessage(poll.id, JSON.stringify({type: "poll_prompt", prompt: {question: poll.question, options: poll.options}})); + } + + // Create a UUID or turn an existing UUID into a string + function generateUUID(existingUuid){ + if (!existingUuid) existingUuid = Uuid.generate(); // Generate standard UUID + + existingUuid = Uuid.toString(existingUuid); // Scripts way to turn it into a string + return existingUuid.replace(/[{}]/g, ''); // Remove '{' and '}' from UUID string >:( + } + + // Communication + function fromQML(event) { + console.log(`New QML event:\n${JSON.stringify(event)}`); + // event = JSON.parse(event); + console.log(event.type); + switch (event.type) { + case "create_poll": + createPoll(event.poll); + break; + case "join_poll": + joinPoll(event.poll); + break; + case "cast_vote": + castVote(event); + break; + case "close_poll": + deletePoll(); + break; + case "prompt": + poll.question = event.prompt.question; + poll.options = event.prompt.options; + emitPrompt(); + break; + } + } + /** + * Emit a packet to the HTML front end. Easy communication! + * @param {Object} packet - The Object packet to emit to the HTML + * @param {("create_poll"|"initial_settings")} packet.type - The type of packet it is + */ + function _emitEvent(packet = { type: "" }) { + tablet.sendToQml(packet); + } + + function receivedMessage(channel, message){ + console.log(`Received message on ${channel} from server:\n${JSON.stringify(message)}\n`); + + message = JSON.parse(message); + + switch (channel) { + case "ga-polls": + // Received a request to see our poll + if (message.type == "populate") { + // Send our poll information to the server if we are hosting it + if (poll.host == MyAvatar.sessionUUID) { + Messages.sendMessage("ga-polls", JSON.stringify({type: "active_poll", poll: poll})); + } + } + + // Received an active poll + if (message.type == "active_poll") { + // If we are not connected to a poll, list polls in the UI + if (poll.id == '') { + if (receivedPolls.indexOf(message.poll.id) == -1) { + receivedPolls.push(message.poll.id); + _emitEvent({type: "new_poll", poll: message.poll}); + } + } + } + + // Polls closed :) + if (message.type == "close_poll") { + leavePoll(); + _emitEvent({type: "close_poll"}); + } + + break; + case poll.id: + // Received poll request + if (message.type == "join") { + // FIXME: Does not work! + emitPrompt(); + } + + // Received poll information + if (message.type == "poll_prompt") { + if (poll.host == myUuid) return; // We are the host of this poll + console.log(`Prompt:\n ${JSON.stringify(message.prompt)}`); + _emitEvent({type: "poll_prompt", prompt: message.prompt}); + } + + } + + } +})(); \ No newline at end of file diff --git a/applications/voting/vote.qml b/applications/voting/vote.qml new file mode 100644 index 0000000..a11e49a --- /dev/null +++ b/applications/voting/vote.qml @@ -0,0 +1,655 @@ +import QtQuick 2.7 +import QtQuick.Controls 2.0 +import QtQuick.Layouts 1.3 +import controlsUit 1.0 as HifiControlsUit + +Rectangle { + color: Qt.rgba(0.1,0.1,0.1,1) + signal sendToScript(var message); + width: parent.width + height: 700 + id: root + + // property string current_page: "poll_host_view" + + property string current_page: "poll_list" + + // Poll List view + ColumnLayout { + width: parent.width + height: parent.height - 40 + // anchors.top: navigation_bar.bottom + visible: current_page == "poll_list" + + Item { + height: 40 + width: parent.width - 40 + + Rectangle { + color: "green" + width: parent.width + height: 30 + } + + Text { + text: "Create Poll" + font.pointSize: 20 + } + + MouseArea { + anchors.fill: parent + + onClicked: { + current_page = "poll_create"; + } + } + } + + ListView { + property int index_selected: -1 + width: parent.width + height: parent.height - 60 + clip: true + interactive: true + spacing: 5 + id: active_polls_list + model: active_polls + + delegate: Loader { + property int delegateIndex: index + property string delegateTitle: model.title + property string delegateDescription: model.description + property string delegateId: String(model.id) + width: active_polls_list.width + + sourceComponent: active_poll_template + } + } + + ListModel { + id: active_polls + } + } + + // Poll host create poll view + ColumnLayout { + width: parent.width - 30 + visible: current_page == "poll_create" + anchors.centerIn: parent + spacing: 10 + + // Title + Text { + text: "Title:" + Layout.fillWidth: true + font.pointSize: 18 + color: "white" + // Layout.fillHeight: true + } + TextField { + width: 300 + height: 30 + text: "New Poll" + cursorVisible: false + font.pointSize: 16 + Layout.fillWidth: true + id: poll_to_create_title + } + + + // Description + Text { + text: "Description:" + Layout.fillWidth: true + font.pointSize: 18 + color: "white" + } + + TextField { + width: parent.width + text: "Vote on things!" + cursorVisible: false + font.pointSize: 14 + Layout.fillWidth: true + Layout.minimumHeight: 150 + verticalAlignment: Text.AlignTop + wrapMode: Text.WordWrap + id: poll_to_create_description + + } + + // Submit button + RowLayout { + + Rectangle { + color: "#999999" + width: 150 + height: 40 + Layout.fillWidth: true + + Text { + text: "Abort" + color:"black" + anchors.centerIn: parent + } + + MouseArea { + anchors.fill: parent + onClicked: { + current_page = "poll_list"; + } + } + } + + Rectangle { + color: "green" + width: 150 + height: 40 + + Text { + text: "Create" + color:"white" + anchors.centerIn: parent + } + + MouseArea { + anchors.fill: parent + onClicked: { + toScript({type: "create_poll", poll: {title: poll_to_create_title.text, description: poll_to_create_description.text}}); + current_page = "poll_host_view"; + } + } + } + } + + } + + // Poll Host display + ColumnLayout { + width: parent.width + height: parent.height - 40 + visible: current_page == "poll_host_view" + + Item { + height: 100 + width: parent.width + + Rectangle { + color: "black" + anchors.fill: parent + } + + Text { + width: parent.width + text: "Respond to:" + color: "gray" + font.pointSize: 12 + wrapMode: Text.NoWrap + horizontalAlignment: Text.AlignHCenter + verticalAlignment: Text.AlignVCenter + y: 20 + } + TextEdit { + id: poll_to_respond_title + width: parent.width + text: "" + color: "white" + font.pointSize: 20 + wrapMode: Text.NoWrap + anchors.top: parent.children[1].bottom + horizontalAlignment: Text.AlignHCenter + verticalAlignment: Text.AlignVCenter + } + } + + // Options + Item { + width: parent.width + Layout.fillWidth: true + Layout.fillHeight: true + + ListView { + property int index_selected: -1 + width: parent.width - 40 + height: parent.height - 60 + clip: true + interactive: true + spacing: 5 + id: poll_options_host + model: poll_option_model_host + anchors.centerIn: parent + + delegate: Loader { + property int delegateIndex: index + property string delegateOption: model.option + width: poll_options.width + + sourceComponent: poll_option_template_host + } + } + + ListModel { + id: poll_option_model_host + + ListElement { + option: "Yes" + } + + ListElement { + option: "No" + } + } + } + + // Add Option Button + Item { + width: parent.width + height: 40 + + RowLayout { + anchors.centerIn: parent + + Rectangle { + width: 150 + height: 40 + color: "#c0bfbc" + + Text { + anchors.centerIn: parent + text:"Close poll" + color: "black" + font.pointSize:18 + } + + MouseArea { + anchors.fill: parent + onClicked: { + toScript({type: "close_poll"}); + current_page = "poll_list"; + } + } + } + + Rectangle { + width: 40 + height: 40 + color: "green" + + Text { + anchors.centerIn: parent + text:"+" + color: "white" + font.pointSize:30 + } + + MouseArea { + anchors.fill: parent + onClicked: { + poll_option_model_host.append({option: ""}) + } + } + } + + Rectangle { + width: 150 + height: 40 + color: "#1c71d8" + + Text { + anchors.centerIn: parent + text:"Submit poll" + color: "white" + font.pointSize:18 + } + + MouseArea { + anchors.fill: parent + onClicked: { + // Get a list of all options + var options = [] + for (var i = 0; i < poll_option_model_host.count; i++) { + var element = poll_option_model_host.get(i); + console.log("added "+ element.option +" to array") + options.push(element.option) + } + + toScript({type: "prompt", prompt: {question: poll_to_respond_title.text, options: options}}) + } + } + } + } + + + } + } + + // Poll question client display + ColumnLayout { + width: parent.width + height: parent.height - 40 + visible: current_page == "poll_client_view" + + // Header + Item { + height: 100 + width: parent.width + + Rectangle { + color: "black" + anchors.fill: parent + } + + Text { + width: parent.width + text: "Respond to:" + color: "gray" + font.pointSize: 12 + wrapMode: Text.NoWrap + horizontalAlignment: Text.AlignHCenter + verticalAlignment: Text.AlignVCenter + y: 20 + } + Text { + id: prompt_question + width: parent.width + text: "XXXX as a board member" + color: "white" + font.pointSize: 20 + wrapMode: Text.NoWrap + anchors.top: parent.children[1].bottom + horizontalAlignment: Text.AlignHCenter + verticalAlignment: Text.AlignVCenter + } + } + + // Options + Item { + width: parent.width + Layout.fillWidth: true + Layout.fillHeight: true + + ListView { + property int index_selected: -1 + width: parent.width + height: parent.height - 60 + clip: true + interactive: true + spacing: 5 + id: poll_options + model: poll_option_model + + delegate: Loader { + property int delegateIndex: index + property string delegateOption: model.option + width: poll_options.width + + sourceComponent: poll_option_template + } + } + + ListModel { + id: poll_option_model + + } + } + } + + + // Templates + // Active poll listing + Component { + id: active_poll_template + + Rectangle { + property int index: delegateIndex + property string title: delegateTitle + property string description: delegateDescription + property string id: delegateId + + property bool selected: (active_polls_list.index_selected == index) + height: selected ? 100 : 60 + + color: index % 2 === 0 ? "transparent" : Qt.rgba(0.15,0.15,0.15,1) + + Behavior on height { + NumberAnimation { + duration: 100 + } + } + + Item { + width: parent.width - 10 + anchors.horizontalCenter: parent.horizontalCenter + height: parent.height + clip: true + + // App info + Item { + height: 60 + + Text { + width: parent.width + height: 40 + text: title + color: "white" + font.pointSize: 12 + wrapMode: Text.NoWrap + } + Text { + width: parent.width + height: 20 + text: description + color: "gray" + font.pointSize: 10 + anchors.top: parent.children[0].bottom + } + } + + // Action Buttons + Item { + width: parent.width + height: 30 + + y: 65 + visible: selected ? true : false + + Rectangle { + width: 120 + height: parent.height + radius: 5 + color: "#00930f" + visible: true + + Text { + text: "Join" + anchors.centerIn: parent + color: "white" + } + + MouseArea { + anchors.fill: parent + + onClicked: { + toScript({type: "join_poll", poll: {id: id}}) + } + } + } + } + + MouseArea { + width: parent.width + height: 60 + + onClicked: { + if (active_polls_list.index_selected == index){ + active_polls_list.index_selected = -1; + return; + } + + active_polls_list.index_selected = index + } + } + + } + } + } + + // Poll option + Component { + id: poll_option_template + + Rectangle { + property int index: delegateIndex + property string option: delegateOption + + property bool selected: (active_polls_list.index_selected == index) + property bool vote_cast: false + property bool vote_confirmed: false + height: vote_confirmed ? 100 : 60 + + color: index % 2 === 0 ? "transparent" : Qt.rgba(0.15,0.15,0.15,1) + + Behavior on height { + NumberAnimation { + duration: 100 + } + } + + Item { + width: parent.width - 10 + anchors.horizontalCenter: parent.horizontalCenter + height: parent.height + clip: true + + // TODO: Change with icon + // Vote cast notification icon + Text { + text: "A" + color: "yellow" + x: parent.x + 15 + font.pointSize: 12 + // visible: vote_cast + } + // TODO: Change with icon + // Vote confirmed notification icon + Text { + text: "B" + color: "green" + x: parent.x + 30 + font.pointSize: 12 + // visible: vote_confirmed + } + + Text { + text: option + anchors.centerIn: parent + color: "white" + } + + + MouseArea { + width: parent.width + height: parent.height + + onClicked: { + // Send vote packet to the javascript side. + toScript({type: 'cast_vote', option: option}) + } + } + + } + } + } + + // Poll option Host + Component { + id: poll_option_template_host + + Rectangle { + property string option: delegateOption + property int index: delegateIndex + + height: 60 + color: "transparent" + + Behavior on height { + NumberAnimation { + duration: 100 + } + } + + RowLayout { + width: parent.width + anchors.horizontalCenter: parent.horizontalCenter + height: parent.height + + TextField { + text: option + color: "black" + font.pointSize: 14 + Layout.fillWidth: true + + // Update the option property + onTextChanged: { + poll_option_model_host.setProperty(index, "option", text) + } + } + + Rectangle { + width: 100 + height: parent.height + color: "yellow" + + MouseArea { + anchors.fill: parent + onClicked: { + // Remove this element from the list + poll_option_model_host.remove(index) + } + } + } + } + } + } + + // Messages from script + function fromScript(message) { + switch (message.type){ + // Switch view to the create poll view + case "create_poll": + break; + + // Add poll info to the list of active polls + case "new_poll": + console.log("\n\nWe are doing the thing") + console.log(JSON.stringify(message.poll)) + active_polls.append(message.poll) + break; + + // Populate the client view of the current question and options + case "poll_prompt": + current_page = "poll_client_view" + // Clear options + poll_option_model.clear() + + // Set values + prompt_question.text = message.prompt.question + for (var option of message.prompt.options){ + console.log("adding option "+ option); + poll_option_model.append({option: option}) + } + // Set the options + break; + case "close_poll": + current_page = "poll_list" + // TODO: Delete poll off of the list + // TODO: Clear poll client view? + } + } + + // Send message to script + function toScript(packet){ + sendToScript(packet) + } +} + From 4eea4a09f07273ac1edc170bd98b247fe4ec6291 Mon Sep 17 00:00:00 2001 From: armored-dragon Date: Wed, 4 Sep 2024 14:44:39 -0500 Subject: [PATCH 02/50] Poll closure syncing. --- applications/voting/vote.js | 18 ++++++------------ applications/voting/vote.qml | 14 +++++++++----- 2 files changed, 15 insertions(+), 17 deletions(-) diff --git a/applications/voting/vote.js b/applications/voting/vote.js index 4d4c60b..14ce958 100644 --- a/applications/voting/vote.js +++ b/applications/voting/vote.js @@ -12,13 +12,7 @@ /* global Script Tablet Messages MyAvatar Uuid*/ // TODO: Documentation -// TODO: Start poll -// TODO: View active polls -// TODO: Join poll -// TODO: Create poll question and answers -// TODO: Create pre-fill answers (checkbox?) // TODO: Save questions and answers locally -// TODO: View previous answers (() => { "use strict"; @@ -115,17 +109,17 @@ function deletePoll(){ // Check to see if we are hosting the poll if (poll.host != myUuid) return; // We are not the host of this poll - + console.log("Closing active poll"); // Submit the termination message to all clients - Messages.sendMessage("ga-polls", JSON.stringify({type: "close_poll"})); + Messages.sendMessage("ga-polls", JSON.stringify({type: "close_poll", poll: {id: poll.id}})); + + // Update the UI screen + _emitEvent({type: "close_poll", poll: {id: poll.id}}); // Clear our active poll data poll = { host: '', title: '', description: '', id: '', question: '', options: []}; - - // Update the UI screen - _emitEvent({type: "close_poll"}); } // Join an existing poll hosted by another user @@ -250,8 +244,8 @@ // Polls closed :) if (message.type == "close_poll") { + _emitEvent({type: "close_poll", poll: {id: message.poll.id}}); leavePoll(); - _emitEvent({type: "close_poll"}); } break; diff --git a/applications/voting/vote.qml b/applications/voting/vote.qml index a11e49a..07b7015 100644 --- a/applications/voting/vote.qml +++ b/applications/voting/vote.qml @@ -84,7 +84,6 @@ Rectangle { Layout.fillWidth: true font.pointSize: 18 color: "white" - // Layout.fillHeight: true } TextField { width: 300 @@ -621,8 +620,6 @@ Rectangle { // Add poll info to the list of active polls case "new_poll": - console.log("\n\nWe are doing the thing") - console.log(JSON.stringify(message.poll)) active_polls.append(message.poll) break; @@ -642,8 +639,15 @@ Rectangle { break; case "close_poll": current_page = "poll_list" - // TODO: Delete poll off of the list - // TODO: Clear poll client view? + + // Find the poll with the matching ID and remove it from active polls + for (var i = 0; i < active_polls.count; i++) { + var element = active_polls.get(i); + if (element.id == message.poll.id) { + active_polls.remove(i); + } + } + break; } } From 39eed69596e94e9fe59f0ccdc3d70eb1b6404771 Mon Sep 17 00:00:00 2001 From: armored-dragon Date: Wed, 4 Sep 2024 14:58:14 -0500 Subject: [PATCH 03/50] Reconnect to poll if application was closed. --- applications/voting/vote.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/applications/voting/vote.js b/applications/voting/vote.js index 14ce958..846e1c8 100644 --- a/applications/voting/vote.js +++ b/applications/voting/vote.js @@ -59,9 +59,8 @@ if (url == newUrl) { active = true; - // TODO: Is this needed? // If we are connected to a poll already, repopulate the screen - // if (poll.id != '') return populateScreen(); + if (poll.id != '') return joinPoll({id: poll.id}); // Request a list of active polls if we are not already in one if (poll.id == '') return getActivePolls(); From 6260f88e2b0a652777ab1d16ccdbd09b2c788c45 Mon Sep 17 00:00:00 2001 From: armored-dragon Date: Wed, 4 Sep 2024 15:04:17 -0500 Subject: [PATCH 04/50] Host closes tablet fix. --- applications/voting/vote.js | 5 ++++- applications/voting/vote.qml | 6 ++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/applications/voting/vote.js b/applications/voting/vote.js index 846e1c8..a5e4a0b 100644 --- a/applications/voting/vote.js +++ b/applications/voting/vote.js @@ -60,7 +60,10 @@ active = true; // If we are connected to a poll already, repopulate the screen - if (poll.id != '') return joinPoll({id: poll.id}); + if (poll.id != '' && poll.host != myUuid) return joinPoll({id: poll.id}); + + // If we are hosting a poll, switch the screen + if (poll.id != '' && poll.host == myUuid) return _emitEvent({type: "rehost"}); // Request a list of active polls if we are not already in one if (poll.id == '') return getActivePolls(); diff --git a/applications/voting/vote.qml b/applications/voting/vote.qml index 07b7015..dc0dddc 100644 --- a/applications/voting/vote.qml +++ b/applications/voting/vote.qml @@ -648,6 +648,12 @@ Rectangle { } } break; + + // Open the host view + // Only called when the host closes their tablet and reopens it. + case "rehost": + current_page = "poll_host_view" + break; } } From 4becc048954dc964795e119bee3422b30350a8d2 Mon Sep 17 00:00:00 2001 From: armored-dragon Date: Wed, 4 Sep 2024 15:25:13 -0500 Subject: [PATCH 05/50] Replace FPTP with number inputs --- applications/voting/vote.js | 1 + applications/voting/vote.qml | 39 ++++++++++-------------------------- 2 files changed, 12 insertions(+), 28 deletions(-) diff --git a/applications/voting/vote.js b/applications/voting/vote.js index a5e4a0b..7daa311 100644 --- a/applications/voting/vote.js +++ b/applications/voting/vote.js @@ -13,6 +13,7 @@ // TODO: Documentation // TODO: Save questions and answers locally +// TODO: Allow more than 9 candidates (() => { "use strict"; diff --git a/applications/voting/vote.qml b/applications/voting/vote.qml index dc0dddc..6cb6605 100644 --- a/applications/voting/vote.qml +++ b/applications/voting/vote.qml @@ -520,23 +520,15 @@ Rectangle { height: parent.height clip: true - // TODO: Change with icon - // Vote cast notification icon - Text { - text: "A" - color: "yellow" - x: parent.x + 15 - font.pointSize: 12 - // visible: vote_cast - } - // TODO: Change with icon - // Vote confirmed notification icon - Text { - text: "B" - color: "green" - x: parent.x + 30 - font.pointSize: 12 - // visible: vote_confirmed + // FIXME: Allow more than 9 options + // TODO: Replace cap with total amount of options + TextField { + width: 50 + height: 50 + color: "black" + validator: RegExpValidator { regExp: /^[0-9]$/ } + inputMethodHints: Qt.ImhDigitsOnly + anchors.verticalCenter: parent.verticalCenter } Text { @@ -545,17 +537,6 @@ Rectangle { color: "white" } - - MouseArea { - width: parent.width - height: parent.height - - onClicked: { - // Send vote packet to the javascript side. - toScript({type: 'cast_vote', option: option}) - } - } - } } } @@ -637,6 +618,8 @@ Rectangle { } // Set the options break; + + // Close the poll and remove it from the list of active polls case "close_poll": current_page = "poll_list" From dd53c9f596c5fc8f33232208429f151bfcf419f9 Mon Sep 17 00:00:00 2001 From: armored-dragon Date: Wed, 4 Sep 2024 15:39:34 -0500 Subject: [PATCH 06/50] Fix not populating if app is not opened. --- applications/voting/vote.js | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/applications/voting/vote.js b/applications/voting/vote.js index 7daa311..d7d0727 100644 --- a/applications/voting/vote.js +++ b/applications/voting/vote.js @@ -21,7 +21,6 @@ var appButton; var active = false; var poll = {id: '', title: '', description: '', host: '', question: '', options: []}; - var receivedPolls = []; // List of poll ids received. const url = Script.resolvePath("./vote.qml"); const myUuid = generateUUID(MyAvatar.sessionUUID); Messages.messageReceived.connect(receivedMessage); @@ -229,7 +228,7 @@ // Received a request to see our poll if (message.type == "populate") { // Send our poll information to the server if we are hosting it - if (poll.host == MyAvatar.sessionUUID) { + if (poll.host == myUuid) { Messages.sendMessage("ga-polls", JSON.stringify({type: "active_poll", poll: poll})); } } @@ -238,16 +237,16 @@ if (message.type == "active_poll") { // If we are not connected to a poll, list polls in the UI if (poll.id == '') { - if (receivedPolls.indexOf(message.poll.id) == -1) { - receivedPolls.push(message.poll.id); - _emitEvent({type: "new_poll", poll: message.poll}); - } + _emitEvent({type: "new_poll", poll: message.poll}); } } // Polls closed :) if (message.type == "close_poll") { + // Tell UI to close poll _emitEvent({type: "close_poll", poll: {id: message.poll.id}}); + + // Unregister self from poll leavePoll(); } From 6de30011007e45e43486e074e0d2af8c3461829c Mon Sep 17 00:00:00 2001 From: armored-dragon Date: Wed, 4 Sep 2024 15:48:11 -0500 Subject: [PATCH 07/50] Pretty "Create Poll" button. --- applications/voting/vote.qml | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/applications/voting/vote.qml b/applications/voting/vote.qml index 6cb6605..18bdfd4 100644 --- a/applications/voting/vote.qml +++ b/applications/voting/vote.qml @@ -18,33 +18,37 @@ Rectangle { ColumnLayout { width: parent.width height: parent.height - 40 - // anchors.top: navigation_bar.bottom visible: current_page == "poll_list" Item { - height: 40 - width: parent.width - 40 + height: 50 + width: parent.width Rectangle { color: "green" - width: parent.width - height: 30 - } + width: parent.width - 40 + height: 40 + y: 10 + anchors.horizontalCenter: parent.horizontalCenter - Text { - text: "Create Poll" - font.pointSize: 20 - } + Text { + anchors.centerIn: parent + text: "Create Poll" + font.pointSize: 18 + color: "white" + } - MouseArea { - anchors.fill: parent + MouseArea { + anchors.fill: parent - onClicked: { - current_page = "poll_create"; + onClicked: { + current_page = "poll_create"; + } } } } + ListView { property int index_selected: -1 width: parent.width From bd5daf17c227303458ca5d65ea4b6277e4845a0f Mon Sep 17 00:00:00 2001 From: armored-dragon Date: Wed, 4 Sep 2024 15:50:30 -0500 Subject: [PATCH 08/50] Unselect active selection on join. --- applications/voting/vote.qml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/applications/voting/vote.qml b/applications/voting/vote.qml index 18bdfd4..1924c13 100644 --- a/applications/voting/vote.qml +++ b/applications/voting/vote.qml @@ -605,14 +605,15 @@ Rectangle { // Add poll info to the list of active polls case "new_poll": - active_polls.append(message.poll) + active_polls.append(message.poll); break; // Populate the client view of the current question and options case "poll_prompt": - current_page = "poll_client_view" + current_page = "poll_client_view"; + active_polls_list.index_selected = -1; // Unselect whatever poll was selected (If one was selected) // Clear options - poll_option_model.clear() + poll_option_model.clear(); // Set values prompt_question.text = message.prompt.question From 05f276ca4d323f31c37b689acbcbad489971e7d8 Mon Sep 17 00:00:00 2001 From: armored-dragon Date: Wed, 4 Sep 2024 15:52:04 -0500 Subject: [PATCH 09/50] Change default placeholder text. --- applications/voting/vote.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/applications/voting/vote.qml b/applications/voting/vote.qml index 1924c13..d0d11a3 100644 --- a/applications/voting/vote.qml +++ b/applications/voting/vote.qml @@ -355,7 +355,7 @@ Rectangle { Text { id: prompt_question width: parent.width - text: "XXXX as a board member" + text: "[No prompt set yet]" color: "white" font.pointSize: 20 wrapMode: Text.NoWrap From a5883b1b2f6a80fc36dba12a28961d43ca66ad7e Mon Sep 17 00:00:00 2001 From: armored-dragon Date: Wed, 4 Sep 2024 15:57:01 -0500 Subject: [PATCH 10/50] Updated font size for options. Delete poll on script ending. --- applications/voting/vote.js | 4 ++++ applications/voting/vote.qml | 1 + 2 files changed, 5 insertions(+) diff --git a/applications/voting/vote.js b/applications/voting/vote.js index d7d0727..5d64311 100644 --- a/applications/voting/vote.js +++ b/applications/voting/vote.js @@ -38,6 +38,7 @@ Script.scriptEnding.connect(function () { console.log("Shutting Down"); tablet.removeButton(appButton); + deletePoll(); }); // Overlay button toggle @@ -112,6 +113,9 @@ // Check to see if we are hosting the poll if (poll.host != myUuid) return; // We are not the host of this poll + // We are in a poll + if (poll.id == '') return; + console.log("Closing active poll"); // Submit the termination message to all clients diff --git a/applications/voting/vote.qml b/applications/voting/vote.qml index d0d11a3..09e2365 100644 --- a/applications/voting/vote.qml +++ b/applications/voting/vote.qml @@ -539,6 +539,7 @@ Rectangle { text: option anchors.centerIn: parent color: "white" + font.pointSize: 14 } } From 2a7bfad711576e02a0267634cd34ec592700cdd3 Mon Sep 17 00:00:00 2001 From: armored-dragon Date: Wed, 4 Sep 2024 16:07:27 -0500 Subject: [PATCH 11/50] Don't close all polls when you close yours. --- applications/voting/vote.js | 7 +++++-- applications/voting/vote.qml | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/applications/voting/vote.js b/applications/voting/vote.js index 5d64311..ade668e 100644 --- a/applications/voting/vote.js +++ b/applications/voting/vote.js @@ -14,6 +14,7 @@ // TODO: Documentation // TODO: Save questions and answers locally // TODO: Allow more than 9 candidates +// TODO: Allow host voting (() => { "use strict"; @@ -247,11 +248,13 @@ // Polls closed :) if (message.type == "close_poll") { + var isOurPoll = poll.id == message.poll.id; + // Tell UI to close poll - _emitEvent({type: "close_poll", poll: {id: message.poll.id}}); + _emitEvent({type: "close_poll", change_page: isOurPoll, poll: {id: message.poll.id}}); // Unregister self from poll - leavePoll(); + if (isOurPoll) leavePoll(); } break; diff --git a/applications/voting/vote.qml b/applications/voting/vote.qml index 09e2365..8e1159e 100644 --- a/applications/voting/vote.qml +++ b/applications/voting/vote.qml @@ -627,7 +627,7 @@ Rectangle { // Close the poll and remove it from the list of active polls case "close_poll": - current_page = "poll_list" + if (message.isOurPoll) current_page = "poll_list" // Find the poll with the matching ID and remove it from active polls for (var i = 0; i < active_polls.count; i++) { From 89f6296e6c0398e798cbb68e50427c7151570489 Mon Sep 17 00:00:00 2001 From: armored-dragon Date: Wed, 4 Sep 2024 16:13:59 -0500 Subject: [PATCH 12/50] Fix view switching on poll closed. Wrong variable was used. --- applications/voting/vote.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/applications/voting/vote.qml b/applications/voting/vote.qml index 8e1159e..fcd71a9 100644 --- a/applications/voting/vote.qml +++ b/applications/voting/vote.qml @@ -627,7 +627,7 @@ Rectangle { // Close the poll and remove it from the list of active polls case "close_poll": - if (message.isOurPoll) current_page = "poll_list" + if (message.change_page == true) current_page = "poll_list" // Find the poll with the matching ID and remove it from active polls for (var i = 0; i < active_polls.count; i++) { From f62d20908aea5ec8eac7a1e28b433feca76b2d27 Mon Sep 17 00:00:00 2001 From: armored-dragon Date: Wed, 4 Sep 2024 16:30:44 -0500 Subject: [PATCH 13/50] Update icons. --- applications/voting/img/icon_black.png | Bin 521 -> 756 bytes applications/voting/img/icon_white.png | Bin 511 -> 761 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/applications/voting/img/icon_black.png b/applications/voting/img/icon_black.png index b62d59774686a43d1f07bf0d0f208aa5cd8fdf98..013fbd3c7d0800e097c49729b52ac0649a108e65 100644 GIT binary patch literal 756 zcmVpF8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H10)a_H zK~!jg?U+4l6hRore@{FSQLquwpms5&&>~H3vvM! zEQ1JwjfIMS04*dS94TVd!YYIti`~P?WM+46Zss-%_lJeMn`fT+|K?@)*%PG{b=FYT z271*1plS^O$|RX?i^zKs`5+=QA`)+0rBt#D5MT*V#`OYdL>Z$3^HCvEnqM&te+51n zzcqnF2MWM3^WT7B-~{k7=1TOojjb^mMRe zm|qStUjlJ2IY12a2E=DA&qhB09>g%8=NbiCTCVR&0f6a*<`poT8sM2W*pJBOo4}B7 zj?k*`kM?;OxYBI`5g7&E<^4Na18ym$+TMu*XYM@ki~qB>3tW#d^Ig|PK>)dlabVkk zxZ%<7g2jArJroQO0ukGM5CCuv5bgT}@Vjg~`D`2DXi@;+EZJS>5!#)iY$beV9=Mdp zOeO&UPLkd4I|dewcI!%b&iqASD{tEd#-aiM$Jkr1>;Ts+aW;spBJ+8_5hHE`I2{E5 zI1IejlDC1I1@Y!~@;b1jlgkW8Vz{Xln^xl`Vf{00Exs z=gt+|z%9`}p90>9h$}XQjySyRk>tet8$|346-g;&g{b|%(?wfI*VUvh+X{9%{dZ1^`v7_5ek9p-r-S<{&&1TCRqo6?mM$NT{ATTMFut1~A9|x2b+!EwYN% mSyDTn19egD5Agt?YW)LD<~<`=!9M~30000bX2XiV02*Moh`x0u^{oWU;{&vUFq-7pFbO#5lx%x%KQoK-nK(#Y!-3=_tmGH$5og7^-*{|6gC zV_?d-aRkjVA+M*uVo+#^crm9jGt7X2ML^d}*Uf4+`!^K_hKq~8dW$m%IBZ$t{_nDt zrD8G2fGJThE0JtRXS$rOYFQyQGfI~Q=F}^BfB!8n^ANu6#K562&2ieC6W?q=o?F6- z;thyF6COu}y!B*axv-&Auz^9ULt>%lcL{|CiT2Znj2jr384~ps8vA#hYh_?yVDNPH Kb6Mw<&;$To>7oe$ diff --git a/applications/voting/img/icon_white.png b/applications/voting/img/icon_white.png index e765410b50e836051e64a1064681bbc9504db3a9..501e736f41a15b108572855ed7496a6b952e4fcc 100644 GIT binary patch literal 761 zcmVpF8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H10)|OM zK~!jg?U_G|)Ib=(8X^GJX@{I91#C&m~}n2!okr}-tz@MqwI_1iMAWwQYk z&HO6R1$F`Nt+GlhF;4SYog#>5p%CLX9~~m5`P-i6qe8?oUv$H|%$pFEZtNK5?*^K8 zL0lOJKn(LH#7Co_HQ%;X9_hCvT{Ny&B^{UaHK4C)NnPW*@7*$R_U9wbyntDtXZ5$} z+ddTFu`$?}$mW-UDc?RqL+F=r-c=epqiR;t8|6diiKO!yLkR5$ei*a%7dR7P=10zp zLIDIE1vV^*vmWgZ7MKsthpGUCKtwek3b2p#8IWDi0Y5E>qHyvFo9%T2>?PfG?vvjs zhOLCp%pV!lIZ+qDZqofe(@m?qY$beV{xGmUDBA!I#Rk|xK419*oGPeS1hGzDMZ3)b ztKJ$g9SdM9@Y3kK51ezxMlB{5I--0(MpfNCq=zYQY0~4)|`hd&Ka4ex7vI zGQDsBdjZ_AOkDFYpB*#6RnoV#(<8LIWR1BL3b1H(bZ-O`Rgde|*q1{9`bG!OsrdP0 z#3KP#jPd(rbvuqUDKXCXNP6X;r$y1W5-&L=Q2GbQX8Y%(5Tf;8r(Gdr>SV1h%Jq6! z1>X=Vjlr5V)I;k-Xadl*S`Xmbg}zCe8Jsu$Oz4#rxK`jn4Msxsu(ZUHk90`0Py20Z roa&Kgw52Jv>p9R0wf-ia05q+C`Is&S_$lc>00000NkvXXu0mjfjG zA5m(501d6g$pIG!F5`fNgr*kPfX-?$+W}-KVAKGN`SK2c zhz?6t7ogQEpfEch4}fkqm6(8?@t(J`DF9rf#a;rqlK^QDcntwk5a><=Zt8)Y86d8G zvhJV=pt`MQQ-$lI;XM?}_jdr)K3VZR==j)l_pLtyMD{plAi% zcb_XlH@6(7Xy;2`>tTYTCp4D8zP$RFu{sIzKnu$hwxohzSz19okq4a)G(m-GXj(P^Tlw+>zMNW zn(<|%?yMcz$g?V6r4v?EMe|ufql#vaN^Q0PxLw?(8044@AqN1gg*NkcLH)odCy<&b From efc64c6cd7ebbb61ffb6dea438f194d026d3256a Mon Sep 17 00:00:00 2001 From: armored-dragon Date: Thu, 5 Sep 2024 17:06:12 -0500 Subject: [PATCH 14/50] Creating and sending ballot --- applications/voting/vote.js | 9 ++++----- applications/voting/vote.qml | 1 + 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/applications/voting/vote.js b/applications/voting/vote.js index ade668e..a362b68 100644 --- a/applications/voting/vote.js +++ b/applications/voting/vote.js @@ -164,13 +164,13 @@ // Cast a vote on a poll function castVote(event) { - console.log(`Casting vote to ${poll.id}: ${event}`); + console.log(`Casting vote to ${poll.id}`); // Check if poll is valid if (poll == undefined || poll.id == '') return; - // Send vote to server - Messages.sendMessage(poll.id, JSON.stringify({type: "vote", option: event.option})); + // Send vote to users in poll + Messages.sendMessage(poll.id, JSON.stringify({type: "vote", ballot: event.ballot, uuid: myUuid})); } // Emit the prompt question and options to the server @@ -192,8 +192,7 @@ // Communication function fromQML(event) { console.log(`New QML event:\n${JSON.stringify(event)}`); - // event = JSON.parse(event); - console.log(event.type); + switch (event.type) { case "create_poll": createPoll(event.poll); diff --git a/applications/voting/vote.qml b/applications/voting/vote.qml index fcd71a9..30fd1de 100644 --- a/applications/voting/vote.qml +++ b/applications/voting/vote.qml @@ -365,6 +365,7 @@ Rectangle { } } + // TODO: Keep track of used numbers and blacklist them // Options Item { width: parent.width From 28ef700a6e92ef0ba68acb6eae13a3a7bbce32cd Mon Sep 17 00:00:00 2001 From: armored-dragon Date: Thu, 5 Sep 2024 17:06:29 -0500 Subject: [PATCH 15/50] Creating and sending ballot. --- applications/voting/vote.js | 9 +++++ applications/voting/vote.qml | 78 ++++++++++++++++++++++++++++++------ 2 files changed, 74 insertions(+), 13 deletions(-) diff --git a/applications/voting/vote.js b/applications/voting/vote.js index a362b68..4e0442e 100644 --- a/applications/voting/vote.js +++ b/applications/voting/vote.js @@ -22,6 +22,7 @@ var appButton; var active = false; var poll = {id: '', title: '', description: '', host: '', question: '', options: []}; + var responses = {}; const url = Script.resolvePath("./vote.qml"); const myUuid = generateUUID(MyAvatar.sessionUUID); Messages.messageReceived.connect(receivedMessage); @@ -181,6 +182,14 @@ Messages.sendMessage(poll.id, JSON.stringify({type: "poll_prompt", prompt: {question: poll.question, options: poll.options}})); } + // Take the gathered responses and preform the election + function preformElection(){ + // Get the array of responses in a list + let voteList = Object.values(responses); + + console.log(voteList) + } + // Create a UUID or turn an existing UUID into a string function generateUUID(existingUuid){ if (!existingUuid) existingUuid = Uuid.generate(); // Generate standard UUID diff --git a/applications/voting/vote.qml b/applications/voting/vote.qml index 30fd1de..704b897 100644 --- a/applications/voting/vote.qml +++ b/applications/voting/vote.qml @@ -385,6 +385,7 @@ Rectangle { delegate: Loader { property int delegateIndex: index property string delegateOption: model.option + property int delegateRank: model.rank width: poll_options.width sourceComponent: poll_option_template @@ -393,7 +394,60 @@ Rectangle { ListModel { id: poll_option_model + } + } + // Add Option Button + Item { + width: parent.width + height: 40 + + RowLayout { + anchors.centerIn: parent + + Rectangle { + width: 150 + height: 40 + color: "#c0bfbc" + + Text { + anchors.centerIn: parent + text:"Cast ballot" + color: "black" + font.pointSize:18 + } + + MouseArea { + anchors.fill: parent + + + // TODO: Turn into function and move to root + onClicked: { + var votes = {}; + var orderedArray = []; + + // Find all options and order then from first to last + // poll_option_model.get(i) gets them in order + + for (var i = 0; i < poll_option_model.count; ++i) { + var option = poll_option_model.get(i); // + + // FIXME: Stringify this or make it JSON safe. Requires cross-verification + votes[option.option] = option.rank + } + + // TODO: This is painful to look at. + // Sort the object from lowest to heighest + var entries = Object.entries(votes); + entries.sort((a, b) => a[1] - b[1]); + // Get names instead of numbers + var onlyNames = entries.map((entry) => entry[0]); + + // Send our ballot to the host (by sending it to everyone in the poll lol) + toScript({type: "cast_vote", ballot: onlyNames}); + } + } + } } } } @@ -505,20 +559,11 @@ Rectangle { Rectangle { property int index: delegateIndex property string option: delegateOption - - property bool selected: (active_polls_list.index_selected == index) - property bool vote_cast: false - property bool vote_confirmed: false - height: vote_confirmed ? 100 : 60 + property int rank: delegateRank + height: 60 color: index % 2 === 0 ? "transparent" : Qt.rgba(0.15,0.15,0.15,1) - Behavior on height { - NumberAnimation { - duration: 100 - } - } - Item { width: parent.width - 10 anchors.horizontalCenter: parent.horizontalCenter @@ -530,10 +575,18 @@ Rectangle { TextField { width: 50 height: 50 + font.pointSize: 20 + horizontalAlignment: Text.AlignHCenter + verticalAlignment: Text.AlignVCenter color: "black" validator: RegExpValidator { regExp: /^[0-9]$/ } inputMethodHints: Qt.ImhDigitsOnly anchors.verticalCenter: parent.verticalCenter + text: rank + + onTextChanged: { + poll_option_model.setProperty(index, "rank", Number(text)) + } } Text { @@ -542,7 +595,6 @@ Rectangle { color: "white" font.pointSize: 14 } - } } } @@ -621,7 +673,7 @@ Rectangle { prompt_question.text = message.prompt.question for (var option of message.prompt.options){ console.log("adding option "+ option); - poll_option_model.append({option: option}) + poll_option_model.append({option: option, rank: 0}) } // Set the options break; From 0700c89503650078e17b43a4145fa641e3ee8d02 Mon Sep 17 00:00:00 2001 From: armored-dragon Date: Fri, 6 Sep 2024 14:00:06 -0500 Subject: [PATCH 16/50] Fixed message mixer spam. --- applications/voting/vote.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/applications/voting/vote.js b/applications/voting/vote.js index 4e0442e..e3c0392 100644 --- a/applications/voting/vote.js +++ b/applications/voting/vote.js @@ -232,6 +232,9 @@ } function receivedMessage(channel, message){ + // Not for us, ignore! + if (channel !== 'ga-polls' && channel !== poll.id) return; + console.log(`Received message on ${channel} from server:\n${JSON.stringify(message)}\n`); message = JSON.parse(message); From fb47e24a65fd1abcb6de76dc73aca78822363c61 Mon Sep 17 00:00:00 2001 From: armored-dragon Date: Fri, 6 Sep 2024 14:41:30 -0500 Subject: [PATCH 17/50] Fixed rehost not repopulating host view, maybe? --- applications/voting/vote.js | 4 +++- applications/voting/vote.qml | 8 ++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/applications/voting/vote.js b/applications/voting/vote.js index e3c0392..442335b 100644 --- a/applications/voting/vote.js +++ b/applications/voting/vote.js @@ -66,7 +66,9 @@ if (poll.id != '' && poll.host != myUuid) return joinPoll({id: poll.id}); // If we are hosting a poll, switch the screen - if (poll.id != '' && poll.host == myUuid) return _emitEvent({type: "rehost"}); + if (poll.id != '' && poll.host == myUuid) { + return _emitEvent({type: "rehost", prompt: {question: poll.question, options: poll.options}}); + } // Request a list of active polls if we are not already in one if (poll.id == '') return getActivePolls(); diff --git a/applications/voting/vote.qml b/applications/voting/vote.qml index 704b897..76baa9b 100644 --- a/applications/voting/vote.qml +++ b/applications/voting/vote.qml @@ -695,6 +695,14 @@ Rectangle { // Only called when the host closes their tablet and reopens it. case "rehost": current_page = "poll_host_view" + + poll_to_respond_title.text = message.prompt.question + + poll_option_model_host.clear(); + for (var option of message.prompt.options){ + console.log("adding option "+ option); + poll_option_model_host.append({option: option}) + } break; } } From 24816cd49b4490a27b0588cc0efc41a43e3dcb21 Mon Sep 17 00:00:00 2001 From: armored-dragon Date: Tue, 10 Sep 2024 03:34:29 -0500 Subject: [PATCH 18/50] Functional election engine. --- applications/voting/vote.js | 124 +++++++++++++++++++++++++++++++++-- applications/voting/vote.qml | 47 ++++++++++--- 2 files changed, 155 insertions(+), 16 deletions(-) diff --git a/applications/voting/vote.js b/applications/voting/vote.js index 442335b..fce40af 100644 --- a/applications/voting/vote.js +++ b/applications/voting/vote.js @@ -12,17 +12,27 @@ /* global Script Tablet Messages MyAvatar Uuid*/ // TODO: Documentation -// TODO: Save questions and answers locally // TODO: Allow more than 9 candidates // TODO: Allow host voting +// TODO: Sound for new vote +// TODO: Clear poll host view on creating new poll +// TODO: Confirm before closing poll +// TODO: Debug mode? +// FIXME: Handle ties +// FIXME: Joining poll resets everyones vote +// FIXME: Running election without votes causes max stack error (() => { "use strict"; var tablet; var appButton; var active = false; - var poll = {id: '', title: '', description: '', host: '', question: '', options: []}; - var responses = {}; + const debug = false; + + var poll = {id: '', title: '', description: '', host: '', question: '', options: []}; // The current poll + var responses = {}; // All ballots received and to be used by the election function. + let electionIterations = 0; // How many times the election function has been called to narrow down a candidate. + const url = Script.resolvePath("./vote.qml"); const myUuid = generateUUID(MyAvatar.sessionUUID); Messages.messageReceived.connect(receivedMessage); @@ -100,6 +110,7 @@ poll.title = pollInformation.title; poll.description = pollInformation.description; console.log(`Active poll set as:\nid:${poll.id}\ntitle:${poll.title}\ndescription:${poll.description}`); + responses = {}; // Clear any lingering responses // Send message to all clients Messages.sendMessage("ga-polls", JSON.stringify({type: "active_poll", poll: poll})); @@ -110,6 +121,13 @@ // Update the UI screen _emitEvent({type: "create_poll"}); + + // Debug: Create a lot of fake ballots + if (!debug) return; + + for (let i = 0; i < 25; ++i) { + _debugDummyBallot(); + } } // Closes the poll and return to the main menu @@ -180,16 +198,78 @@ function emitPrompt(){ if (poll.host != myUuid) return; // We are not the host of this poll + console.log(`Clearing responses`) + responses = {} + console.log(`Emitting prompt`); Messages.sendMessage(poll.id, JSON.stringify({type: "poll_prompt", prompt: {question: poll.question, options: poll.options}})); } // Take the gathered responses and preform the election + // TODO: Simplify logging of critical information + // FIXME: Recursive function call function preformElection(){ - // Get the array of responses in a list - let voteList = Object.values(responses); + let firstVotes = []; + let voteObject = {}; - console.log(voteList) + // TODO: Debug total votes at beginning of election vs ending + + Object.keys(responses).forEach((key) => { + let uuid = key; + let vote = responses[uuid]; + + // Assign first vote to new array + firstVotes.push(vote[0]); + }); + + for (let i = 0; i < firstVotes.length; i++) { + // Check if firstVotes index exists + if (!firstVotes[i]) firstVotes[i] = -1; // FIXME: We need a special case for "Non-vote" or "Vacant?" + + // Create voteObject index if it does not exist + if (!voteObject[firstVotes[i]]) voteObject[firstVotes[i]] = 0; + + // Increment value for each vote + voteObject[firstVotes[i]]++ + } + + console.log(`Votes: ${JSON.stringify(voteObject, null, 4)}`); + + // Check to see if there is a majority vote + let totalVotes = Object.keys(responses).length; // TODO: Check to make sure this value never changes. + let majority = Math.floor(totalVotes / 2); + + // Sort the voteObject by value in descending order + const sortedArray = Object.entries(voteObject).sort(([, a], [, b]) => b - a); // FIXME: This works but looks ugly + const sortedObject = Object.fromEntries(sortedArray); + + // Check the most voted for option to see if it makes up over 50% of votes + // NOTE: Has to be *over* 50%. + if (sortedObject[Object.keys(sortedObject)[0]] > majority) { + // Show dialog of election statistics + console.log(`\nWinner: ${Object.keys(sortedObject)[0]}\nElection rounds: ${electionIterations}\nVotes counted: ${totalVotes}`); + return; // Winner was selected. We are done! + }; + + // If there is not a majority vote, remove the least popular candidate and call preformElection() again + let leastPopularIndex = Object.keys(sortedObject).length - 1; + let leastPopular = Object.keys(sortedObject)[leastPopularIndex]; + + console.log(`Removing least popular: ${JSON.stringify(leastPopular, null, 4)}`); + + // Go into each vote and delete the selected least popular candidate + Object.keys(responses).forEach((key) => { + let uuid = key; + // Remove the least popular candidate from each vote. + responses[uuid].splice(responses[uuid].indexOf(leastPopular), 1); + console.log(responses[uuid]); + }); + + // Update statistics + electionIterations++; + + // Run again + preformElection(); } // Create a UUID or turn an existing UUID into a string @@ -200,6 +280,21 @@ return existingUuid.replace(/[{}]/g, ''); // Remove '{' and '}' from UUID string >:( } + function _debugDummyBallot() { + if (!debug) return; // Just incase... + let ballot = getRandomOrder('C1', 'C2', 'C3', 'C4', 'C5', 'C6'); + + responses[Object.keys(responses).length.toString()] = ballot; + + function getRandomOrder(...words) { + for (let i = words.length - 1; i > 0; i--) { + const j = Math.floor(Math.random() * (i + 1)); + [words[i], words[j]] = [words[j], words[i]]; + } + return words; + } + } + // Communication function fromQML(event) { console.log(`New QML event:\n${JSON.stringify(event)}`); @@ -222,6 +317,9 @@ poll.options = event.prompt.options; emitPrompt(); break; + case "run_election": + preformElection(); + break; } } /** @@ -285,6 +383,20 @@ _emitEvent({type: "poll_prompt", prompt: message.prompt}); } + // Received a ballot + if (message.type == "vote") { + // Check if we are the host + if (poll.host != myUuid) return; + + // Record the ballot + responses[message.uuid] = message.ballot; + + // Emit a echo so the voter knows we have received it + // TODO: + + // console.log(JSON.stringify(responses)); + } + } } diff --git a/applications/voting/vote.qml b/applications/voting/vote.qml index 76baa9b..40a73d7 100644 --- a/applications/voting/vote.qml +++ b/applications/voting/vote.qml @@ -234,23 +234,21 @@ Rectangle { ListModel { id: poll_option_model_host - ListElement { - option: "Yes" - } - - ListElement { - option: "No" - } + // ListElement { + // option: "Prefill" + // } } } // Add Option Button - Item { + ColumnLayout { + anchors.horizontalCenter: parent.horizontalCenter width: parent.width height: 40 RowLayout { - anchors.centerIn: parent + width: parent.width + anchors.horizontalCenter: parent.horizontalCenter Rectangle { width: 150 @@ -322,7 +320,30 @@ Rectangle { } } + RowLayout { + width: parent.width + anchors.horizontalCenter: parent.horizontalCenter + Rectangle { + width: 150 + height: 40 + color: "#1c71d8" + + Text { + anchors.centerIn: parent + text:"Run Election" + color: "white" + font.pointSize:18 + } + + MouseArea { + anchors.fill: parent + onClicked: { + toScript({type: "run_election"}) + } + } + } + } } } @@ -436,10 +457,16 @@ Rectangle { votes[option.option] = option.rank } - // TODO: This is painful to look at. + // FIXME: This is painful to look at. // Sort the object from lowest to heighest var entries = Object.entries(votes); entries.sort((a, b) => a[1] - b[1]); + + // Remove entries that have a numerical value of 0 + // FIXME: Inconsistant with how we are handling non-votes in the script side? + // This is our "leave seat empty" or "non-vote" + entries = entries.filter((entry) => entry[1]!== 0); + // Get names instead of numbers var onlyNames = entries.map((entry) => entry[0]); From 8b4df95790d27330f792bc8ff1d62858cd0f0ddc Mon Sep 17 00:00:00 2001 From: armored-dragon Date: Tue, 10 Sep 2024 14:52:07 -0500 Subject: [PATCH 19/50] Allow more than 9 candidates. --- applications/voting/vote.js | 3 ++- applications/voting/vote.qml | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/applications/voting/vote.js b/applications/voting/vote.js index fce40af..44207e5 100644 --- a/applications/voting/vote.js +++ b/applications/voting/vote.js @@ -12,7 +12,6 @@ /* global Script Tablet Messages MyAvatar Uuid*/ // TODO: Documentation -// TODO: Allow more than 9 candidates // TODO: Allow host voting // TODO: Sound for new vote // TODO: Clear poll host view on creating new poll @@ -22,6 +21,8 @@ // FIXME: Joining poll resets everyones vote // FIXME: Running election without votes causes max stack error +// TODO: Voting results page + (() => { "use strict"; var tablet; diff --git a/applications/voting/vote.qml b/applications/voting/vote.qml index 40a73d7..558b72d 100644 --- a/applications/voting/vote.qml +++ b/applications/voting/vote.qml @@ -591,22 +591,21 @@ Rectangle { color: index % 2 === 0 ? "transparent" : Qt.rgba(0.15,0.15,0.15,1) - Item { + Row { width: parent.width - 10 anchors.horizontalCenter: parent.horizontalCenter height: parent.height clip: true - // FIXME: Allow more than 9 options // TODO: Replace cap with total amount of options TextField { - width: 50 + width: 70 height: 50 font.pointSize: 20 horizontalAlignment: Text.AlignHCenter verticalAlignment: Text.AlignVCenter color: "black" - validator: RegExpValidator { regExp: /^[0-9]$/ } + validator: RegExpValidator { regExp: /^[0-9]+$/ } inputMethodHints: Qt.ImhDigitsOnly anchors.verticalCenter: parent.verticalCenter text: rank @@ -617,6 +616,7 @@ Rectangle { } Text { + Layout.fillWidth: true text: option anchors.centerIn: parent color: "white" From e117c13515d781cc2f3d8b4a35ff4c0dabd9618f Mon Sep 17 00:00:00 2001 From: armored-dragon Date: Tue, 10 Sep 2024 15:08:25 -0500 Subject: [PATCH 20/50] Prompt before closing poll. --- applications/voting/vote.js | 7 +++++-- applications/voting/vote.qml | 1 - 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/applications/voting/vote.js b/applications/voting/vote.js index 44207e5..f6b8e23 100644 --- a/applications/voting/vote.js +++ b/applications/voting/vote.js @@ -15,7 +15,6 @@ // TODO: Allow host voting // TODO: Sound for new vote // TODO: Clear poll host view on creating new poll -// TODO: Confirm before closing poll // TODO: Debug mode? // FIXME: Handle ties // FIXME: Joining poll resets everyones vote @@ -139,13 +138,17 @@ // We are in a poll if (poll.id == '') return; + var answer = Window.confirm('Are you sure you want to close the poll?') + + if (!answer) return; + console.log("Closing active poll"); // Submit the termination message to all clients Messages.sendMessage("ga-polls", JSON.stringify({type: "close_poll", poll: {id: poll.id}})); // Update the UI screen - _emitEvent({type: "close_poll", poll: {id: poll.id}}); + _emitEvent({type: "close_poll", poll: {id: poll.id}, change_page: true}); // Clear our active poll data poll = { host: '', title: '', description: '', id: '', question: '', options: []}; diff --git a/applications/voting/vote.qml b/applications/voting/vote.qml index 558b72d..3c8f1da 100644 --- a/applications/voting/vote.qml +++ b/applications/voting/vote.qml @@ -266,7 +266,6 @@ Rectangle { anchors.fill: parent onClicked: { toScript({type: "close_poll"}); - current_page = "poll_list"; } } } From 335a682edcf77adec99bb8b74fda22382f695005 Mon Sep 17 00:00:00 2001 From: armored-dragon Date: Tue, 10 Sep 2024 15:24:16 -0500 Subject: [PATCH 21/50] Fix joining poll resets others UI. --- applications/voting/vote.js | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/applications/voting/vote.js b/applications/voting/vote.js index f6b8e23..651bc9e 100644 --- a/applications/voting/vote.js +++ b/applications/voting/vote.js @@ -17,20 +17,20 @@ // TODO: Clear poll host view on creating new poll // TODO: Debug mode? // FIXME: Handle ties -// FIXME: Joining poll resets everyones vote // FIXME: Running election without votes causes max stack error // TODO: Voting results page (() => { "use strict"; - var tablet; - var appButton; - var active = false; + let tablet; + let appButton; + let active = false; + let hasJoined = false; const debug = false; - var poll = {id: '', title: '', description: '', host: '', question: '', options: []}; // The current poll - var responses = {}; // All ballots received and to be used by the election function. + let poll = {id: '', title: '', description: '', host: '', question: '', options: []}; // The current poll + let responses = {}; // All ballots received and to be used by the election function. let electionIterations = 0; // How many times the election function has been called to narrow down a candidate. const url = Script.resolvePath("./vote.qml"); @@ -384,7 +384,13 @@ if (message.type == "poll_prompt") { if (poll.host == myUuid) return; // We are the host of this poll console.log(`Prompt:\n ${JSON.stringify(message.prompt)}`); + + // TODO: This is still silly. Try using UUIDs per prompt and check if we are answering the same question by id? + // Don't recreate the prompt if we already have the matching question + if (message.prompt.question == poll.question) return; _emitEvent({type: "poll_prompt", prompt: message.prompt}); + + poll.question = message.prompt.question; } // Received a ballot From b6ab61a28f1da70d0a1f63546ea066e0df517e55 Mon Sep 17 00:00:00 2001 From: armored-dragon Date: Tue, 10 Sep 2024 15:28:45 -0500 Subject: [PATCH 22/50] Clear host window when creating poll. --- applications/voting/vote.js | 2 +- applications/voting/vote.qml | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/applications/voting/vote.js b/applications/voting/vote.js index 651bc9e..131526a 100644 --- a/applications/voting/vote.js +++ b/applications/voting/vote.js @@ -14,12 +14,12 @@ // TODO: Documentation // TODO: Allow host voting // TODO: Sound for new vote -// TODO: Clear poll host view on creating new poll // TODO: Debug mode? // FIXME: Handle ties // FIXME: Running election without votes causes max stack error // TODO: Voting results page +// TODO: Joining poll sometimes causes to double stack on other clients poll_list? (() => { "use strict"; diff --git a/applications/voting/vote.qml b/applications/voting/vote.qml index 3c8f1da..bb77114 100644 --- a/applications/voting/vote.qml +++ b/applications/voting/vote.qml @@ -159,7 +159,6 @@ Rectangle { anchors.fill: parent onClicked: { toScript({type: "create_poll", poll: {title: poll_to_create_title.text, description: poll_to_create_description.text}}); - current_page = "poll_host_view"; } } } @@ -681,6 +680,12 @@ Rectangle { switch (message.type){ // Switch view to the create poll view case "create_poll": + // Reset poll host page + poll_to_respond_title.text = "Prompt" + poll_option_model_host.clear(); + + // Show host page + current_page = "poll_host_view"; break; // Add poll info to the list of active polls From 2b48831cb7f3d44e76aab2080dd6b4c6688a4b77 Mon Sep 17 00:00:00 2001 From: armored-dragon Date: Tue, 10 Sep 2024 15:38:41 -0500 Subject: [PATCH 23/50] Fix exception when preforming election without votes. --- applications/voting/vote.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/applications/voting/vote.js b/applications/voting/vote.js index 131526a..9c4a918 100644 --- a/applications/voting/vote.js +++ b/applications/voting/vote.js @@ -16,10 +16,10 @@ // TODO: Sound for new vote // TODO: Debug mode? // FIXME: Handle ties -// FIXME: Running election without votes causes max stack error // TODO: Voting results page // TODO: Joining poll sometimes causes to double stack on other clients poll_list? +// FIXME: Closing application also prompts for user confirmation. Probably don't want that. (() => { "use strict"; @@ -237,6 +237,9 @@ voteObject[firstVotes[i]]++ } + // Don't run election if we don't have any votes. + if (firstVotes.length == 0) return; + console.log(`Votes: ${JSON.stringify(voteObject, null, 4)}`); // Check to see if there is a majority vote From e428f3be82cc874829951c5ae8e0654afc22c009 Mon Sep 17 00:00:00 2001 From: armored-dragon Date: Tue, 10 Sep 2024 15:51:41 -0500 Subject: [PATCH 24/50] Play sound on new vote. --- applications/voting/sound/new_vote.mp3 | Bin 0 -> 68545 bytes applications/voting/vote.js | 3 ++- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 applications/voting/sound/new_vote.mp3 diff --git a/applications/voting/sound/new_vote.mp3 b/applications/voting/sound/new_vote.mp3 new file mode 100644 index 0000000000000000000000000000000000000000..e3666fc1c978d3c495d8806b518038b20df972fe GIT binary patch literal 68545 zcmeF%=TpHdE|1#KazxL=Zpm>wLPfb*7*`Q0Ef= z-q9@&C744)hmxaZ0s%<5E~GG)#6&gB0-DMj)6l?U)7uU+$qmtD_bx9)XPp+B9gXCc zLHN-K4=ZpYf;kZ~P@Ern_*8TFKm-R9PSP|VkyX@7c4Uj|5rspzBG*6!UwBUjhxP$i z#2QTZK=xLKDoz&JU!>336CvOjk`c);l~F8Fl$*bHEuv9r(%0DdKmzN_m(-&|Dq@Xf zk!9$SqamX;@FzC*fd<@6L=c3E2(?Gk&{Ba?u4HrG)EH!EdWVO{<;2I;Unbo@q;K&I zlinA=1He^m6aC|gf^{$vE`bnwOHVhlWSKRyKxxHft zWetlQNZiMpgAGd_RBC2EjqwyrbsYnjX04yyziGTq4-7gsi;4IOB|w=qX~?4g)ursO z(qy+~jDGu?h5MXlh;xnvI^*C7dIGwumj-c}=!ONavkP9C zs|?0jGrF<=Z-LcEq*7wBXfNy}ot<*Qq^Hi_#}tYW_TwiO3q`?F6Y#P(LB-0?sm&%h z@o3f7nv@JnM>0SQKv2jGN8ua+O(c#l^#Ts@3C?tA{E_3hvJomogf-Piqyu&I%NaVrQ;H?>ufqIARTa`mL@2|xuPTH zOR89Ie35qqKNB_&&*xxGG=>h>Eq>~7lJ!jFz(r7Iq6q5na1H+~d=kQ6Q z+`u^wbkSXnfVw6%aU6^4=2Kxc|E4FP*^tH!2?kk~G z^i=6Su24blGvEn1j(nlcX~Rx+ybd|E`|qyUbCEy@1V8mnHFaU>*OvsLgiU=j zk;>IEgPTr!-=M#B)()of3Jvt~{R4}c%2l%Z@$O^))($X#l$$DTvezm(DWe?@Ki^v? zwS{)1hz0pxQA1Q+yE?!8CgeDoVm=(p8L+hSCYEyj^#57Ni>(?dN6HF?a`AsMi*7jU zXE^{3@Sma21p0!=4-do1z$Ye{{;)CNdRW2Leog=@JipxE#0Nl;Sio2`Tw1Q-oU(F% z9m>;0Q4iG2*z_sPArS1r0Rrw!s|pC9>z>=gyEgy>XfYqCb||-qz5f?SH*tF(xi%{oVL>WYM0*Cc8N6_N;Iw~y&Z|WDK{>i`o(}F?xxnz zxBuoh%#iw&W(GeF#z)>;@)LZes8Cr{tbj?}tK^ zDnIF-%Y7E7-z@`5Zq!(ToyRM-1Mkd+6(53?d#f7>h-_(26qAOSHjT2@8egCD?^DH(rFjn{;2medsp^?O{K^We z)eiZFa5)kzPIooDoe57NO|16N0k2`Y)Yk?~pc@b;;99J-;?TGGG*&rv9oUNuyH}`q z5LM)t3qC>WE{fRRg~`g6JeI*-RtyBe4Fdk%o^4((&S&<5)M8%6=>x9DK$v}7jCt6Y z_t2(pml{Xm?U40yd90^}x9ra$Di$Rw5`qVV)vD7#&*^~$F=C`%AOjYS<3%_|3JC{G z&||!~b-?I2tKM!$fL0xFz9Ow>%#0MhT?$U9!aT0Y)0GHT{?a^N#pSTWPW;c17GNMA zpkvmtni{FA=-?I9EMPLvf9vO)u1emon~MYG{_kqipY-V2s{ZWRhlqw3SHbQeI_u;f zF1mgh_RDs0sdjDKA2JH(Kf>aX93?jitHFO6ps)Mh$x*9|p}_PsT(8G0o&Yv3P$Vjf zyBZ5{4#Nn@x3moCa+)saq=zL!Q4>SfGDpCuZ>+A$d43G=P#sfQxV!1h^0eBK|-61vvABe1eggrBDz%MV9jRXEAEUpVj2tYi4sBMh zv<0W^7nf}{KyCYOF1v+&r)B3+OP?G}38zqOdh8aC>?pp)l?)G8M9uLWSrI1{OP2L9Cripqx$=2;GSVP&z;mffhIeMH3_;0NZ4G z(-oF~ieN?4ahH2uY$BECP;>3x;N-*jba0M1 znSrK?fhv2#)t5`o!`$G++9dyzUHS4FC8pZ-`S#~xlFycJ4W8f)fCI@q7v91dKL4D( zgJQu{(wy8;5p-fdd-l)e9DJ`kae6=IXWj98dEZiBdHKA9LcVq(X%DbsnObmANmi7I z0zubz!&p|%qy+aA_rlmj$^N6?kE)-EHpR_JGgIR(I{n7Zwog}PgU>s{FDMO7Gah(z zRA+qy!sKeHttwuR0jU~MUeaHjVTzdM$R66v7f9KY-tUzgqIICnPVn)q9y+{~5wS<1O(0Z3|ylUAKeS z9~(auur6e#r$ltEUtXi1Q!NiFU=!#b_pIu`hy{I3EqZkrX1!&jXcVNg9OLuh@~pqG z_4ORO#CrwjZK$h%MV@EAQ#$xwFiN>x@#xUW3y4+x5I4s zjyp5=WJ}(Bo@P4?f7PK*q1dE5qHilSH%Vr)I(Wocp2fwp%Q=@>QqJ>gvNrt}4r`9o zcbXK`f*(p5fti;$m|BR1Jcjd;PRZ~p_3PegHo{#EINL9I52>spo^vZjxCx&UW$5ZF zXk9K}0>_l$C5bV7LaBFY(;#5EIU#`*!57AO&(HY)kV@)W8(+oIk0Dj$vi{x^P%6Vb zoH=a0Lpz8AuUt2Qzb4`x|7QH@qbO_eA#}3;GJST6{%tt&UL{0`LQ0S2O1XFZ=|bgp zrJCLg9bJg5|HgIhl890}S7a~o*MxOGQO}HX>E;2={c)XD^?ki}wXRh&B>Tmmwv8#r zx6>rfnRBhBqq98$^4bQ8v$> zM}gK6kJZ%Iy>)7YPNx#~dD!g#1$8(K#ff1IzAK2ie9;^UcDLw1Ru-dWn7pFVXdW3^ zcFUJzu7u^Dw^*b_XJC=TMO&m)oUJC}L|c>UL_rgRqslN-B>C{8G1x;1Sujyu_d}@G zCG<&GDHWnfe}n8~&Ht3DpABa&C_wkI9LI{#@e>jQVbBr(Gen5{|TGP_&eYn^qL0&nT2|x*Hkk#b>0eHPeMMSnbS4vifTcJf+9FFRO z-xg_MRj#8J5_IC#&2zu)j~zc~tILzNpG`8k{j{TpVB8fQ>!ap)>s=`z07{OE)++U) zd*`Y0A$!8A#guOZ=>5v)=~l9mxlIYVxKLE_$ZHq4Oax0-nB?j0(s~v{RwUmzDvho` zHdSzQU>hIQBH+ca?t(VePS1%Qr)SeE6w2A$f!*Klp5YYAf<_kC`{kvD%uMrDFhBzc z{AC3)K*o9oUSj=u37p=!2BKVk$y6jPR)AHe?^G}v_%RKs|9CoFQEDync-p5&qOWGX zT-;UErg*+x-p~K@%GqU#^V8czY$QP@?e6KjU#f*y5IB_AAx(?l8_W%>OXW7+GWX=o zUToU^EY^>(9#f2^JiTopee;)Ac~cB+9RR=09U@1CR)v^RrMjc#AQ`YaEzDyP$E*=c zS(vn$nre`Y%_SDF7Y*$B9QIrC{l5*odxemsh_r;qBAZMRBZwSWM25Cc5w~j8II^DEh<$?c zsZBpUh<}R8l&XZ?)XuK-F5MIa8CQ{Ayqs?Ex%JLi)of{6FE)%|0?_`eF{cMduL?}9 z58&t2@e`n*UzkX#fq_XpsRh^VZyW1xerIZRa^+QgAVGak;D_Gl9cr_Bjl|%G%UJ^w zwa4dnl=;VSuVrx#<(f}IU#3{be3*5Ypb|Gz!TP^L%va8`D!M^a;V0D@3iD>tEw9i5 z*c!A7As21gIe_+$6i2^x{CY$DrT4YhUB=g&>C+WpJ-0AGzc)sJ<`P;H%#YzdM*nf5 zVvm)$yv`2Oxf0`{E=n)YkA|ALG*ihqM;O6db9`ESh7ZjH`|dBIzmn^6u@BS~nW(L- z$#I;hm%h3>x0@JP68sAv+Q-A#*Y8$ozp9?WJ49UR;``5#4kP@vn|kE=LVB{eVtR6n`S+Gwt z+^#ewT0hIlp_7@Kb#yd>h3lmFkn~d*Q-3J(nIMN){=lN0U~+K1`nKkI^*gnW<$#O5 zp!WgcPm{mDP}|?QP`+4JIewA7s@eWkik!^QucO8SfJ3l=ssL3FP^XK=3Pi%DEM=J? zg7PLis?@R)0=xkFOT@V3ltjXiMa4;yI&1n-al)_(}3ZXvnfiTTQbP)VtW4}Z|0FTp2pWt*Tzp<>QP=nE zPGK|e+f^AP6NKQV_Ch){`FKs$9RvpD0nbhHtHuSw;lD&i7e?w6kB0{tw=k|Xh+n?E zKcAd+Cr7*45^KYbrd@Xj?X$izumEorEsA1GFz$F@VjsqQOSqPA>Ywz_-f{xkg6u^z zl|G7|olUSejA@IUII=2yIGEM&3*{rJlUIwGSr4kEkR?(W=r4yn+6&3td-2J4FFd4U z=9Ch<@ppw1KnVy6SNpZMZAYB87!{2l=rTg0 zd@i{!l7%DHh#t&DgTt}%0w0GLsBsbHjVEq>T#xch{xc*Nr{|CFPW(5K9t~Ga4`IH^ zv*gHfbx%V5Oz3OD((C<1EhOMSSt6WGm4HCRr2^cymm=83Zg1%s#D0wOZwkP2Gpzvi z&ZYxW%8lL140=C0PS$9ChLVp=D*d>i<3WX7-{>lj*(HZxCLZr(^Ne+m{h}8{XlO53 zY0LS8!8Gnt%HA6!Bcp-eIoTLN<|VMPSzG(PUArsQFVtS}_{vvke0ox%LqogrY;blv zeaDsZISOL#u*j1w;fz_iIJj7*oSvOYhuMW}9Wm9GQCKL2SNmrd7b4&PJKg?P+zA+( z!yrgKRulqU5u0O$T7IdXCKiC=FJ2wzMoEA=>4E#PR33dZY-wSdN6r&ZUJd3>I*Qk_ z^jrFcqyVXo$8PJ}UvnSWDwr*twq7(+D6ih^hDc`s@}dv($)Pz`j`mJKO`6tdnXlR7 zAu?xAj+x1y>GLPQc_oYF({%rYQx1=$gmfm;u^=1>%T9vrOX28NZAjuwzemiDsBo;< zy%G9O0Ypq{APzOwh(nSaaExfxB&v6Sn1iNn)QlvJR>I^o=_^l%goBpvTfJ}JWCVrN zbBc;b-gf@@@pG!6j%`Frr7(2rb-5Cn!#CA*_e-c%4Q}2r{1HJeWYAaiglo=Pey;h> z3%Z1a^xwzq${SDeABu-i);+$MMS(=kxwtE8Mi){hU~EKOSj5sw+uyu0uTMXXm!dne zDqU-~gy(ky+9xkH+KANf&bg(Ey-{PN6kJfk=eL#yk11hq)J`c!NEgiq&;HupITX$e zcY6g&0QhR7i~s_RDGG?aaj23r4UDZWYaKzOVf0mRx%HZm@?DlQh4QOgyd#*UZSJoe znk6j>ru%T&FW&qkGx@H zcQI-#9I1#L9>={;shoPQns6oEj&e9n1HA3b0!})ALFKvu+Q1JlLLPU$VusFHpx(~3 z?^q2OaNv7*=};fsnCiN8>7I>(Z*X(v+-2dR70S8Ejgn?cpwgNwH3kFOG)j+QPRo@! zs6Hu#f(Ks`dz>tWnTnB5ze#>|JIOn>qFk*6)`&*S_D}S2hkG{vey%27BKi`c8kY7{6WoI;YiG# z$9~m4Pp@UP`Ok1(7~klybOZezI{iJ^^!|Yo&+@_PT*6Xy%5JrFtJK_^7>e3DWuH8B z`srZTcAazfy!s$y@4U({#V^Zh`?RXDY2<=y?-6CYV3bZHb#CGLf6rW?SVg~UQ0!aM z4YUm7wafD|ctn#i#jWnX8_i*U!tT1obbgD3d_Q@*n(bA z&Y8mZkN^?|sVCe8ixZ_`_R-wS@RvIqUm~Sp_seS=IkNun-zPrftdCFU0ca$8fPB(0 z9Y(+E+eD|H@Ft^#fuBC2Ge_lAjp=L}^Z6 z4&|MI>;L;(;9g@`3zy_GZF`pwqG!qK@`PCIT@&f z`XBS3uPDjND<-&P-Ym^~svVd^zA<|E{9Nkk#M#Hab&HBg%SSU)$qf6iPz_Smnyf+^ zN$uw(f{~8;s?09+b&*`q z6;^LRYg7{7rA0%;k(_cwU@w_s8Gw2X;|wD`bxhL#?&W0TXx=~QHheKx7ojf}7vgh6 zFliIac&r!yujniN><2eHvLpQ_Uyvr%-f8-xP8Yb!XV8QRKC{+~dj4r@hO^W~j>`Dg zSNF<2$@B#Vfbg2T&MK?CxYD3txv}FU;MTa*7NZ1J~Nk- z+ZNt+R8zJnlnblb6~DiGp3WVV??Wr?;lH$lbq_6%o|tgPd? zb}i=5?C70g^O}Oo+uQdd9y7ugjBOsSiwj8p21}C1a0L_UTpZcJXvB`(V0U zefHmD{V0^b;Xlx<1YNXfrw>{cXhH|7n_}`KaMy!c`!NL(KJw`&Vlvla%+WOv2elBg z>hK&G*+o2oqLikf=({jBS)3SOmxG7RYP8sXY}ANsa~{8SNr623hm^U;*f=Y&&>Ynl z!$}d$PStp^5Y@*;)A_Z|i>6L+A4Fk@sR)rLh7@$RK4{`ppu%1WX?)Y@`gwnKFU(R~=S1vk&ER0}j!!!V2OI1!3l$v4PMqU^0(4PR; z-H?L4j}QS8T|k!v_)!dECNOLRAIHO7ldF!#0nrLH6FyH(*N3?2gcx_dDs62x^wR8c z4NqLe`3p2>O2Q4R8+Dyodm{NB21o0Bqj93b4}2AqGG~&Jj5H9Knkwd@Y$}s<;#W5) z+F>O$2r4uSf{MU`qp7=sfRbZybTbAF%|u0`dnWcq;@rcyk}eRA&dU{{;Eh7a;9rfT zD`3dax}6VtHK72R&r`iOh4?0d0HIA14;rw!!T7(k94Q{@k4^kHkrk$o@()T16xjR- zzItGwJ}vlFcvtL4P!=1vTVJqr#z9)FqMlMrGC|38s;Y~|O{TQs5+Ci&^-m4K(OOd= zHeM=|C0&&b00p4C-@kdwfVL83D{ro-mY)3~cE7n&V_5jHt$|8w_Vubv?}tOqPjkC4 zC#FdgbNNq=_3a6*OmNqc-%FmuZ*q+s#Wf{KRF!zTelU}C!sm{ zZu-U0>-O`F<6X;tZD&hQ9Q{j!&ulkpdn~{kAXcI>ZQRE0JEJN89fTiR3dNZKMSv@PI8_<|LrbhA+2^;TmgodJGkD@|<$Yt3! zn1_jer(u=%-Rr!CQax3bq4XnR)whJ;#z~G#J<-pdZDlYD2SaM=7LB%VYR=n@RMdwG z%}vMOyDNbQcq2oz8k=9kzXq!q@jSS-GxcdphVMlz$6{r$Is}}FSOX0(`huoVMG!#E z3|jqLP*VDb<|WAok;K&~S#=MgNw}o08N?W$0lecVy2dx0rG>7?FPV<5@@euA8Z+*~ z{hv}rNj}CI|*WCFn)LN;_ z#!N0APs7Jz1qFc!$;ON#OhT&;Cu!^UFH0R?j+WiNl>;R^O)@1?Id(VCoJ}PTzBl4e z7_=&!A7a(Ksx7VUWY)2*i7z2(+ zyQ_Kqd0zXZBtgN-3ET8$*JK64X55j732y3gLO**f|Hj#jZ`DkVo_~FmmtlIPsfK#zV|pwhRsk-F=V`~IOW`Tp^`$mJ!}Y1L;P}_v`!1W zG*QT4C{Zv!W`g#W&s?c(xGl={ZX00?kp=Lyk)SDN7U;?4BBtJlEXljgvY^M=vRX%R z8DcbwlVDcfHTp%BNZ==Y93MuaBGceNNJboLRSLi&;z2fbG$_wx8C|E~YBWbC|1`>x zS@w2JylJNn+8Qs(+eTQQN7t92+F`du?b#RQ{W)x;$*kR^1$>1`tp}KZM=1nXeoimQ zq6j+l();CpPtg3h)NM(ew}B8L(Llf%F(@zvPrC zoS6jT1Qz(kNNLN6pKZWe&S>d_oNiQ4g1_5qW)s!dQaMle9{8 zgq1Tl{n^_R+uM(ioC|Kg{_MoAt6Cu5BrN$obhAmH3?%?AMs5Uv1jat@3KTcOj{!qD zSdz1K+(~tkJ%PK^$th9;F@H||4gK5Dar4EC;tJK9rCzUG;?p43zJt^?)3+x-TDy-| zU*es1udJn*-QLi<-}+$7`im>`mlBDHJsm5CdW*9&%CUmV6O}eK%Hb>7IAE+-kobJ` zi91Go^o@*_F1MUl_l5!-PA$u+2|*`n(W8wa6=-Ebi%g{nunGdk-hO~0fUEP~88Hp( z-{jJ+0JNh6X@&Y6Vx9ZNYWxr?f$g|l5mveX`j8Yob>D+7$cwo;Kbn)+kR%1$_FCAj zUzJ@m#R7gcuiYA~)4x=Mv{S|6uUWh&3OGAp6tj8#!+ z$>_Iy(gkMWb@t!0P^kckQHhOGf7fG&@E~QWX}2VXn>Ll1mmXPfvsJLgJX{+JdL(`^ z*DtlzUcJ=%+r$~8y}V5^f41I6v3s{n;W^G5y4r(KqwKH0`FG)(t@O#aeV5X@7j%Ac z(Q*ulc`lrd+8CQJoDu`01!w>^0F%nh1e6b8PzaXI>`HXbF|AVeE6npaAN<$)#8Ck2 zCdOS-)gmixIDWNwgMOa-lZu{;&#weJ)P2o?q^UCXWDygCNXaw3LX$nS>Zgy+ZS?cg zds|(f<3H&~nd?Ty1^<``sLRN-rChvs*f=1dAy^cYa1YN8knoZOUc3pgzNX9=xplhqR33DOT11O0<6d3ybs48PrHe@fVrdzsX}nqY!`r# z)5sub+?E`V{)Js!_5BXnY!K4i6fjqV)Wu-vbDds_>Y(lP0IFB&Q2h@LZ-i&kly0u; zyRb4Xxg__-{ZfaN&sNAPR3A=wa?VW4Lnr-RDmGP08Ec&_mP;%2KZ!den47fBi^lR; zVF8f$+YBrm6^ALf?J9?|ggt-y?Ae8L!H$2vgKW-od7^f<3jeC!WYN_`UcFB^4j=vm zN7_(&M(f98(@0w(=EX%m#_HVV-QDoLxwYUQJI?ZkuRiFDv+9zi4plR9a;WVG(S4$UkX33a=RRJ?LKduKxy4>;Dg<*neb1JA~P(P?#r7OU;ju6de(Ml{Aa<-d6j#2 zFMdh>{l|Y+$nhqnHCOe~=E^U=#4!NE$qbYjxXS=NeC~KYRB1%gT_*$K7)a8->u-n| z;R*{q9SsL=T_9#Wr_`*WW|3Ii^}sRNOtRQi0wco^l0IlNDRB9)WnsSceSFWfsZD0Y z_{v_z<_L8|`okfs2|hAOYVTB$lxRo!Y(nbzK_PeYf#f=6!8D!bkjI^sFnsqnUe?8^ z#L%vP>~b?mS@WR`x%qZsDv^Aay%mZih5#%nNC6vPN-BWOWF>#TrpZ!)h?0vpa*9Dk-JtpLt*m;Zl+~?K1@>kb( z6;!QjJ-2zQc~k2{KOVd~zrTC!;y7=Qv+rO2>};uX$JvMQ-lu=|DJwHiYO5Ar%x-xO z@xedC%S;p-T|@pL3J9ee1fJd+G(p)y2K`cQdrZju{jL?0c0Wp2NR}98a}f^B6%HJ$Pa6&a}>Fm6RdM} z`$1pV?Y;;OT|fYKHQPlL^il&u04kn2V!|RomcitKYtlksTF71Gt3-iyx&88o+(3Ut zPlT(rYvC9TQ!^`L$W>$Qj8hH2j#ul3LtCe|dHzAI@q&g|N6k3O$FVHWN~yr!W1bEC!7>z7Oa)Yp;E3 zEyk_snw`;|iIEq|5xMHfK+1O?hToD5sWKD{z`kAw07RTn9H^#HNlKkh2>(`8hZFwX zQ@z_iAi_Q8tNlrXJ!%4v6?=9QDh(;kUVD1c`(GQ1ijQg4?P`4SBh`nxJR#(jBoBWr zwDwo!#|z#s1v{@-dBe1Sns<_Q)ay+qfvE99kKfT-$1m@u)dauEG#G6>b6MEb+|}UI zDNeE|P8EiJ87;wlVcc2|e?z%w-=W<4P?!ObAY?LP9pK~A0i%>fpiBoa4jD=x48X*= zF0_bT$MdYi2s$y0dWJDn0KLdnIhv^Z!QP!?Vn~!>tTPyJ78lcti@!n(a`e?eIvEGr z;MgO}sUs>n7-eMHiJaD94(;7Z;;hF3t;tkfSh=A@6KQ`v=-QqVDPNuje;R@i)UDedA1lK%sN1QY9gRGXp z%#VsC-Lz^yYxyR9sV0vHHWk(eW`#D4>YL*0xWV?C!Do~efsh~nT4nyOzNLcNYo&tw zZbp2Eg2kiY92^W{n`tM?C{Lxd&NkFoZYymbN*QGHPTQ#5PPwfyS4jDzO>$MXSm{sK ztAK2F3MW_j>oCDKn~&`fze(-uQf39)Pr`3KEDDyzuIU@j>oP_TykPK?vOT=SocwxH zS8G8vVf5ms)Y+vr-*aWVM9Y_8<_Q1~CIC_Ud{pYj;=@!vKa=F@IfhfncEek1{5U@^ zpJA5$NX3M0VEvon{|#=ED0q&yzj!c9j~xT!}QBJ^#GK zx zC4mT`T~VQ=hm(Q*BsRqNVW{Fcjs`S0;f5f$mtMyRefebV(_THSbozdAkU#I&o7jMW z42k(ni4TIqz1QrE zrRNnRrw#l7;03qcpHvMeLXrX=|AZ+k=ptMj@X` z#IXukFcF7t7*kc}picJb6`Zh1&g~xR#+DVhAE$rrpC`9eEwwZNRz>hBOra+dGPpmr z^fYwN=pns-mm{t4A;hMQHGQ=9^{1VG+H#5cD=XI@DMziYWmvU^elERS!`HNZd$d&6 zEx6;;wZC^@tr_+rjF-s50;1nj1=vO0y7;4Fv)t`XMoYek%xgZd76m)S-X)C5lFp19 za0rdL31ME6JLtxUJ^q$Jh75dhpxl?9hU+qF8*e)JuefSQD*El?y;G1!Gq`&`pq%~Y+Kvq(poi3FgB@c z8l-=N?}JkTfFMYMVd)SEB-bz}pC!qZg>i&AJva%ne{Q7qMq{{*{1itI)R08dgh`jl zfjF=+32Rah&R9gj8&}$f#iw~!yjMq44l_5R zW(soq3+}xuDjMC!yeO&g%auGC`Xzem5mOQ@bn2$fWa!a6dKybIPAfnSYOd0ri%UGl=P(kBAr9{dk$|RyH%F?H^oi zqo(d&v{{G0XUqSONT%*eyH#$X!#-{tNt@|m=yOqOf}-JIs|W3$xnwg)_rp;9)cTDL&8W^QnL=+x|s z@9&)m=c|5uyf4Y78K0F{+?ebr4#ws&;n#tnvE3LzvfcE!&3(8sZixq3ekHM0O-x|<- zWP@D6;YAz-IyGz}inya5I#g)?$srrl5;{;aw)Q~xUTRs`bMEIpnJnKMVrhtre>0J; zOnFTb%1w82mB!26=ehs3t28fH7gf$pf^$B*4H$FqGPL=-l1bi2lZWkMQAN+s=<16u z2?Q=B+{f_EIiy#7s4#zSRq=J;or$?>OwxTqCgdYwm&%?fMq?e}&xDEn_E^97yL?3y zS=qYQ{quZo6~dah&kc%k5KJSM(gYF1px%TW&|4BHlG+M7hNj_LWo5TXMZ-FU2nOV< zOrS`sS0LzzMt~3SS_KV*R#^;ZC11G$S=*=o8Tv_+jWg|<3?FNV6g$xlNl*}$KRROk zE zx(pktbas6GwgWZS^t{G+)O9XmiOfQSWX7<4E6=m7DH5;RgDOVlf)$w8*R%bbTYBl4 zIG>QOl8jPx@w0CoP*-pY6USZ|?t#_iGy04D#y!@7QadF8v`h6 zLT==$B&w19SBjTEszPSGe+@TtVj6CbIbO$81-gkvIX2!0= zUY}vU05?A|SeM&J7LTs%K>9NI1H0gPTMq;_qbbv6L39Eoc5oXc1;wBWI(j?2q zcN@vevD3+T_S``ed!o_mnu2Htf*^*2wF@YMBr(wDLtqhz+JhN9mc(nICtxr_(C|$) z0f;yPRBNU!v=h&IeL@9>2DL>4@=D+QZyL~uT>gIRdHR`<3~SKm?EW>&ING@=qeA&F zt9O?7$d%LNJ@f5ypN;gx=2^yV@g_kt!4le>MVrObbXG0-IIP1?<*iF^U+efJ(N+a7 z?0>bf37ne@eYJiuEnm;-V6Go?vjFALZ4Xf@o+iLACd2@eCTsK z%ZgWhz%stkCv_-)XH6^J^*Ky%Pr14BiDv1Kqn)FOy=}h{LF{BymKZQ;X%dRgg&rK z5A4;A2jA$@2F74~Zsa~xgva46q*x7yZ|DEM%Wc!oWrV$l{0rWXa4pvebnW9W_GPcm zquX_JEQo<~(>j}`w_~3Z7AmfU8nqkJ>eYXJaIH^z?ss!I`)*Tl$S9j@aO0!*^)BU~ zpQnD+j*fXmo1Z5n#=b1Qk*#=|RPZs*=X3Yc`4fBF3rygpYJSb;!WpYNmlSr>jo#sL zZ~2O^r&skt#@6JaYa*Z?2qsVl$$P+!e1Z9=KAGVyV`e6JMVj_OXX`Iq|hLt93k7c`sq>-f z;BUb@Z!MBP!&pat&bWFXk=}ppjxP?RAHy)@Oa(rk_2aav3C!beR7wAv$aJ*LFlMjh z+($Y%{`BKWm*-8h%JAjGAif*j>6Sqchzzb*;}(XT-@WH8a+x8jS~4|qv8Axo1zsuR zc})N_r{;lxA^?y=t8fXj%Q>L?83Zpy!O+uCJQpKv~KR^A5FJ_3P1i|cBbN$zcb{OZrgsVjU3*LY7Gf*Z794hE} za>V#+`{R24>c`nauVNYdu}d7{V&sD>V5rk$v4m6|D68mH>6kH)KR%OcPY9{oQVrDg z4Nmy*XXz8Mye}HebS{$}tQ-hQ;2*qhHc$-Z4KzWkXK3xX7+m>kDq}zw&EJ!{YrW+D zt%_9bLyXRw)}mR{`W6mSfm>zuBASsLtb3RB8sR?;mzzF&8e)Vk9on#4hV^&FF zQzdu5)4883ZlkEf^b z{YcO-bM>6i==o@=Y%=UHY^`M08R-K zPzV(>PEIDPN)-9&H>)|dN5m*BFPYGBcL8K?FFk4I_X@9zWdR_*z_x3HWm zrpXpG>)Tr(kFym_?Jus7T`HqUD}@*M-i9Ho)vsR`7O^zMu~(f7D8c(~eCX{%qlw1b zwlBHsJ^N&=<)@1!*0gyZiLlntxW!kw!u=heKJv`@gwy=oT-$#Mw=^jCNw(?PU}>J4 zW$W|jZ*n4eP5}O_0U3Y<)`8`_y!~3r%d(ze>YB`vB;#n1-If1AO692jl``qmNb>tI zLhi1uu9fuNmngb=$GKy#4WDJLR&a7#}$}NVt+YA{+Oa3nw?ZT@G#%tjC=o($4 zdo+yE>4*WNn~jo&k&@EV-Q5k+9fF{Acc&r}k}3iM)_b1cdH;yd`QCfa6*H&(*FKX% z_}ql|*1{vRQ4;)hQ$o_gjM_80E#$UbrnsqoxDPdsPS#2-kv(!v^5-wBtEn<6zLBz0 zY1_E0i>dr{gqL9DR(DRx zIzqx;hX7Y7K0NS5iNZ&n3##XR^mZW$*h#Zv?d&l|6G;es&T}sY&eBL2>&fouDf*VB zl-N5k=p(ZFVbA|e{`vZXctc8X-qwrQke$iNx?IN(3}62->=)JSufO}KDQG9_obYh- zPd&Q-eT%F4iDQe*!*Q_Hv%dz9*Af{=j?rD=BZh<;5Ile~gmlOeLKWT%;a9AL1dvFJ zL`}ViW=3O)La6LS{FRCzW{Ud|(UDLHEP_#t3~;1O4pg8dulVMbrI(U{KR#1ChLEN` zRHGy(SOk$(wseO0;-FkQ0oHENaylnb2c4;;Zrv~sQ@1xHP1tAcPAO4bv2xDydyU`^ zG_3W-s4Qe<$8BVQt+?GlgYEY!P5(1Wk)tNOE+=iKaW|%s6!`1q0hKIKncx1G%5in% z7dQ(!AwR>YG}~s+-Qv_HKNs$4uhSk+^koI8!OtD@Qne%71!8}h>(p^n3nYM10`EfVNkKe4& z*y{Ix-+kDB7TVgtZoJnt?`oj$wrGi^0%vefZ>NO^ZT_@3xL1b0-#qEPymB${TsAqf zI`tOM^8WXZ<6p_=fAL#Dfc+2=;9!Ubqk2dgTW{Ew6S!odbvd#Q7#fX6!bYZXzYMWs zSPUm(Q4N~|1cpEW>>&&QUQ3<}uH2TlbHSrcQL_X?Q&`q>X z9eZGm2g~xqgYa3(4wW2h!W#8AqiOt)7*Qfx*W7jviE7$Y>U0?CT=D|=O28nh+GfN! zPa%XY|8KSa?zX03V_Rs-seW||Bl}G`I>BtR42JjI#+=3mTVvT7xm)<wUbG;y_CHY zM!qv~WcXSB8a&r(%*B*lta@adNqB?V&F=$Ub!L(|Bd?%*&h|fCO{<^5>F+zi%i4fB$i2!p}iXp-bb zp4CfuqaBoNh!Ox3!k7-1!x|1>A?S2ky>@mc-G7#p+BY+34NcIBg@5sO(t##By4^6U zXSi7k{ftF~oN#<#v5TsHNq7UpC*7mq)?{6J`yw-+S94ca zkF7saO{zpe(c}ZVYTMFDVyndRy^9a6aD<)6L_52`O+PkwQ0ki1@^dqHf?%~qlfgH? zby^%wE$qs>bA^@tT;O%}>6{*4mh!|#0W$>}vV@oi*$?wpQezO-^=A7?FV3NFAtUJ_ z5J=8iUgPDp$(8w?Lbs~yagu@E+Bmn4(e1N_$nKZMrY6>wrKMkuDE()6)*Ro=^?+WR z0!OC4%ysV3=}#+6&A-eMx(}A!38J{u_<_9G*@-NK%bNHDJU z*wQVSIA2~y$JiM=cdId`$DEw7#nT`d-w#HC|d0|HELmGxV zpk5jjP(H;`s6N@O2!RqmL~*zVqNPX*kpVD40I+9x05UxQq#yDPMQ)EFD5U&bLrQ=$ zP`nExsIKc2t5w&zHhy^;20Dw)B0U>U9Hgo_2VB1{;1m& zW68qj347IP6z4;Y|2_T$bSq;_G3$P7ABc=GzN_Nvr!GWLj29^`^vH;rcUZSo|GqSz z`f=TBma@Mb!WIVqTW(Mbh{p(r;lfxcL0B;AdG#yH@Zz@Hw9Z)IpUEl@r_!l8&XN$Rhc) zrI&V@b!+=9wVr1n-l|d`s`oGyTiuc<^EUyz_4g)?tA)Ik zzdzn}UM?zXOq$Ll{4f$UnUgo#>MR?ye(rtii-PXwqo0N`Yi(ME8in5zUIG9h+vf$z z%=EcDh172Oh2VU8U_KvK6o6I;rE}pB#`1^dQ%(Es!<-m>p;hYg^aVpnM&fwMGE1LD zrQq?Oq}duvoPrNOyNlkfUE1Dn-DR}IphuqFbbggfvr?XC3;8RK3{zXcVu(|7Qw$0CNlS?5zvU}DHw zGh&a#KIcsjDTZYGpEA_Q)Wc==>(I})Z}Un%F2h9W(9fB36|N=;#iT%{^<25xtX@zq0hM}6b|KM{tS6e`7yye(zVyG1kZ z9zJ~evD^G|H#m1#A~!u_AF87(8Pq8(hW~rz#%517cfDk*FKDIFF7)?z@n+F$!r7Fk z#*UDk*i`?VSOARPnjT{U6J}ya-%JkS#&?Uj6< zD4jrxsYJAsVpQ40ATeY*q-&czv3M9HiPmJhR^F02cTic&hpJaI849ohYqLZiG8W~0 z>tlGTm%FU{X+9@6YVuA@O~10KcVC~~-yf|p7*VlDP7ZgDFGb24N6DZnENtrv2N~PV zGi(&8+RXLZ05LEK2)hJq65(^<}((>(}FM9)zt&hq}ck}qQLeQ_Tm6>(yrS1leID-&%de6_-jHQ_hZ#CFl|E+l!D-}3W(gE3lQWzVadvJpGfUho3rgqrl9j*X zP%S=ky%Cl=NexbkH=F;+P(xQ;@6+dl;?|LIyh4opocoO#QdJ_V^>Xg_pD`M(sC<1U z39TsFB092pxxNwX!MCW`-mg}|=h&de_hy!hCkB#S6G0kG0AYRng4NKHlN9DZ>Lo@) z@K*G29<6s$l3i9TwA<0})B0&lm@SkT9%{a3~%| zB7!X;d87R zTf}nMl+TQ@a#fD>S8UG)&*vnyQSpSn&m@kpLM>_O4qZp8M#@_v{w&vdg*8-U z43#5P&u*eg@XubeQL)+y&CP89)mp3fFEEKOnK%8aVwht-Oc z^HK7Kt3%9)l(D`|LGS?`b+|k`hFAdk%4c1E7BVyPGijR=cPsU%hKsCb`XQP0>(s&V zAEuNh92+x>A8_c_JP2Fg$-PMWtaPp~vvHGy%Gvf%n6mLuEs^r-4Hy7SvQEy`) zUxt1V?4yKDJXq!WsAL#O5u+eSI zVe<;fKJtiDYC$R3lUb0;I9Gx+y?9h(*!c9@uVA`aNqI8oCOb;p6E(@PN_cuBs?yOf z*(Udf@eTnAG>LYs*y?!6G(<~dC9PUDIN6I4$6B7szQfsUS|m!vLkFbs;e9TGFCg4< z3%*sYc&NK1_lXY_1ZLjLTQiBJwQlCTVbo{W6dEMmL>dD8zy0n|liC}_^AwKbKO2cx z>sR~Ns$z+Z8SwY+pBAex=IfaR20u1=QGYNM*T;2P6go-V__$Azk>1%E_!6frD>=u* z(ndfSvY}P6Wblb{8pY31LOriXC!Mo@ujEaTF-oFF$f+{W7`KL6)FS?K)-=$gBO#xk zdowGyQUJ@y5?N`(z`)>*>T{t(wn_Ae>0vNHXDkhHyfM&YBx*DnJ_1 z?{>ZuyA>wVc%+t_y)?YQ=p#xSuifVS5uUN=nD(gyoW7&qKyz62{6W%f8GrOYL-)iR zghB5q7a4Bmbti`cW2cbYH&429i%Fno&*3NZ`Q4yX4&Rkvo_L1!i9A{VDGaeAZFJ$A z$X-PAa~*!kPV_d_lCC+K`Y~&!(Ze)rX{gRq&m4E@=@;8DX1eL$&>3+jGNFW@aM{_) zQjT5EXOjZ4srHN+<~_w>>!n(b@a?aHk$drSv@j@*Ea9J>PndXxKx(*} ztvgUk1C~xi!oJ$8Wbum^B-uK>pS-3nPx7mX;!vtVR?mGG2q6!>>K*Sn!x^W|j4RK7 zV9$>&s4h2jUY51C?FHf63fJYLN}E+bgGE%ZWML8EL8*fJ^9Dnw z3Yn5+iV~hnf1RxRl`aCGFuxS7zuHvfP(M-dsZ=p6Om8@=GA0rn7IQnu00l=vQZ zs;BqtyMT*MO-rTL-lAVK##taY`&%DBRsR?smCr@iW1-;I_YB2Byhkjw;$1U~?nK7R zem1lsSL%+eP1me%;e8Mcz$nIn2;?>6XNYkFRFuF@Eh7o4iZzPOnh!w{V_^(&*r)72 ziv3KR77#l>VfB&E>w;07H{}Jc3;74>lGCvx>U*s*$4d0lhg_)9~kygFD znhTtZVwN}lNR9)SDiu*j$6{Sy&6$m%kM*>g3H7yg+@;2r8+OdC^Wh56iDm1~;X<&h zA1yZ+mR?I`29JhnlWu`?{{7fZInm<&#q1wy=D5rDOCBAIeMs-JP^l^xzTmL6SPQOD zunr;y6SA&Y%K>!WI$uPE_ou8U$#9Kb8h;v5(9S#LPZ>l9@+FI9yZlIWPG4tlzk05o zT`I#*)%+tT;i{e;VNgUX;bX#O;FVUCofShJ#@<;zjEv0Z5)-jl!>{PY9~0N(>Z{&9 z|1cNII}NwUvLb_wWVdCxR{m|~_>Pq&m??-=$h0*oI*T9@!4{Y#(Lp|yp1fY-+2-hA z!HA-$T+$DDt0!OD2a^uc`f+slc**;MA(0LTkj@ieof{TN*x-4<==Bqceo(gt`P&Yy zV35!@iA}*^mVRmb;<`KS0Q|lNxPNH1$=keSK*8SKX*!o;^CNtI zf12zKuI)IbJ_2gNg}{Ta(K`umANM2gEJoL#h)enI42%{`0xYT?E(v;>er-Hx^H-5+ z*W*}qW?R)5tFU5IVd(Mjg0Sf73!lach%s!^t6G^OmyKo!eT=FZjfx}KT{>d=|%qUtIHa%Ms;+BhX>j@Ub?$e3>^BCUH|HK zxKQ$Mzi*|Ii$!(0atZdklINfUe`X9*z%A{2KX$AUnk4_(PO1Ac7`p!MasT7pSC^3U z5~IgCbgu2B!jD$p!8MfSaq=8$spBIJT0_+TG4yj8a@BXL*$UYw`TD(^=hul`fh{j? z)VzE1#nr3Ff97&snwPAAB_37~J*XgGi9Mewaymy^22_GE9DX1K!o>U({y^5{?9hP^ zAi3C|(QHFm;F$MF>nXu{X&!^fTEKR>-4PwpV8^T4(+>(k10LtQ!!EFiHQ(23!2b;W zOu5GmQy^*;U0N0HZ3|A816e*ikU|!du%5ACY!(FO3!C(eUplJnBi1{xIS2ana{{QOXH z9QsYuvAS?I%Q>29y!~V|^>xi{7=)=xEQD^hrN^PHxl)hwg#`J^X=?y@Bb|FO=HwJB zmYft9FDn)^wz_Va6&6>yhZKP16SrPH2!CMsi83t3ln$M+k}Qs1tb zX}#NrUrzI{j{5NVkD3awl?dVL*UPAV2ZPpADmTic!z_zFRckWl)E)P_F3j7+D#Qip zu(r=$8z0|X67`p@x$wL7=EUMOo`=jYH&5=J+PCkGJ^kL+@!GH36?wi(HCpN( zYi=3Tws9l#x^N@io7qZYQ&Cs8g=e!_^5uo2V?z?2S(B*L@T&b z;Hgv!{ds{@`VJY&j@Y2l)fBt2F_UnEm9eW~(`RwI5O=jte)CbyP?&tS^CaK@w*jXu zv~0S%CDZ;g4F(#Kze}~R-=4457)8|17DqTI{KC%mC7wU25h4af5@hR9=TtBANL4$A zzm22k(irj@HNu8<&8^%g*Bg%k*di)WDVobimfy4B8SmCA%FCCM#UTOOs^UYNh3YUi z*4+1?q$Q3qDNmqd(z@5beP^5e{#CMKh3Xhy9lrDxt7dFZO~zG62J`|qN=&0h7u(`L zL%&k)y~E_Ac5Dup(l*-yW2*l`K*Y`iQ5P zeCQ7fiu?w^pQFGK8#2O3Z+|V8!Ae#fXWp0ejdYE7oSweTc~j|Sk{Jt{YLp2H@)6v$ zKhcEbR{EjjG?L!p`w+-trdLUl6C|(cjfzW3b(TUcc1UCEI#y&x9kR95gw^Mqee7Nq z&zbsYMcmdy#&ppdZN;3*j0IwPn1U&yW85Tf2;#JezE+g{Fd*XBvE?3|uZUw#$#(Juf4Io!kp#1ck13hGTz>N@_$S5sP6%^*~zCX59V zsFY{sz}(nKMDP{JFVir6U06HG`A9mbXNBe*g3LcY_l?}_^H<|0T9>*Z=8%>?Z00ep zyy=!?!Vd6?PCu^&p#*F1*4BB@D<%RgMMPci4&_ZvgBj1yT*Y$U^mjDvqH-OW`fEKz zw{kvoS?6cSXmffhy~Qsd?lMSu3qDO3=XiBxUYto~o+^3Tswzo6WP5>Z)Q0DU!XG9x>7IpEI(U>y?FoLY*@#C>e1%4o$ zMp=PtX)llN>-PR^tp~(RWJm84;(Gxk=gD_`(>qqb)N_$R`s+)yA}9=sMMbMpk8lMW zDkVgmM|n0HcC{NiVi+?5v-KCJC5pF8(0QWldtn3|o_F!y+8rNDE?SuNEDIEK%;9;i zxe+4os(|S;M0hh4+9-Be+~v|_6YV@2ZfypG8joY2g}1I+MOW!EB1u{iI zG9I55?Kfu#SS428wMb$R6keI~W{J?I=)vigmHo7;t)waq??d38KkU@3VRZaG;$7CkF71x4|-3rZW@fljeX0<7m zGyj|AQZ_U~2cw!amlj$#+k)$bXxpD2blMi9$QAyZ3o zBTdX&ghOLPbNE^q05Q^2OlC|KFxs3RZ)E9LR%iJOh=md zg8Jh4-NcP7v|~n^b3>n!>S^O4{ZXFqgB|%bipB>Gn3nk3>q}&!CQKucnmKne{Pd0_ zGCSf$#!e^uREBNw3aFE@Qe1`(fa9CUdcZSWE;l9qaMTmNM~?i2-)2Sw5s-#J@I>8O)EzWTf+tQXubC{?#Z{v_NlwSC)ew!pl|!V`V@`SuAJdQI#VORP{wRYONP z#gHIcUT_Mhcpc_QJ=aOIPzB?O5hGeL70|}?)=oCyBxwC0*~6!W2&%PS(;rgHvBT|7 z_^b&T)H!#3o%l8Ads>!zH)fM!%BN-b|Je+M0^w&L@5D-re$#^klM1~6++f>HE z#KW*&I3t^Kgd~oS6?1bP=&C`AKBSbLQD(Fz_=e{c`aCzWnaz-WuxE zd|)SwXQnZ^mftv6B-kY$c`n#F;)8EVTRMJwKJq5fvp2){d!c`0lDA1;W6{eZLr?uc zV-B^^4Y@gERA|k$3x|9skC(a9PqS}DZ4u&zQH7e;1FNyN)k<4vDW4OMuR+=!jb7q^ z7-t>Of2A!WalBW5Naa3+z&CN$*7qz zliX)`*O6Vf{#N_x{F^?RB=gb|-O3CeM;jO{QL{)LB+Z+D>&y=HEqU3 z4g~+-p{OwVtXiFs*{_>z!3Y()n5TP^EAA);h0@_waQ&{P_ zS0s>DvJPb8>2i>ABn0TJT$m5@G?1KN+Z`wxDY@?BDLTF^6p6AW^u@eY<=2Env}DAh z8P*8&IZoVZ;A}Q1>>J;y2aCQl#cI|3H)7w~PuU2%E;8|HNZB+*98MO&*P-Prj3qtx z-CYgey0@X@^R^nL3&1+FM8QO%U$rT>JT6M5X>SY~7r90A=iw?2-Xg`k?rV=nrBRES zoDr2b!CCrKg#Xz|PkiCFkO1SKGNF=UU*aGy z9U$e;G)2nmhQg(@B+#IA9KM{-+#dlc=e5QFN@Bvx(fa z$#tdWicnD>whfz|xi0j&>0^Z4I%{;Y!S zr?Vi6IrT?LRd*7ukX2D;w-gt0XJIN!O!rH=XcGrxI(FM+N;=k5c&^c9LkYN<1HBbS z5z84XYT)vYF!+)-Nxl%}{@1)-L$p+B4UMaFO){^jZ|rd1tG{yRu;pk!wWEkQb8m_Y zCQ*E2>t>OzIM$%!#Gw028MOA(MQ^KZuewpF%d~c>GD}2%)ZxPiWhhrNJju?a2<2lX zm6E{AAA8|#E5KP9nb%tVoQeS7ChIx(53bQpSGsT?M{A^sr#D&f1!p)sy5XNddy1^3m4aT^+o;hD#Dd#2VkI%j$8 znyArgPnbvPU$w;$F$L^;DLlN-YMbZqP>&_nH9_PFrl@9FC6C2I&0Rd^IW>K!N4G|| zW-aYIsnO%7>fm*b%{u!VM7cY4dj3~3igk7eMtxf`NfAro;QJM_xgh{@xMyuYUTh;B zuzOXvNQNY&$q#3Yi1gFMQRV_*n^4bHOI8W{>Fm|K7kcHol*u|xUa3MZl*~Hzt#guS z&5Gcv)MR^f$pHRCPfkLR{L)_Pe9@TL(V-Z|Y|vE-s4ln-dS?Hq7ad7%I7HSJTUi(l zV&B#6%Me;sH;^PuIun>91a5_?1@E+cgaPx&Ve1`UT^4OXh(ffa63s%0gvZkz%>2W z#D@A8+`0lkM8|mNt5vkbc?=Q_h6`MzTnz-8iujg$fT zVkArA54!<0l=cPBx&n(`KTeN62rnxzmz)OHh`GnL@LGAFNu9PaT zlnArv0yPz_tCjo_N?HMxkxWa*&n-36`r}e1c3siPQeFMm*-CN)BEVersuh$fK6#}9 zGtXfp*ujMfE|e(2i@cc|52|Ga!{u!?LA(uS>q+Vfv|B3Mw%<`vxUAt5dA0gKn^(Qn z$us1`PC34+?&Qy$t~$3zx%4|s?Yc^aDgvKS(L6nKHVFUO0nj`>0Yay zJ8Q(HSL4lS)K*ePU8){VI9Jqw_);G0(q9_IOUTqh-+Hg<~z2C5T_SLwpN>CL1hNi9O|bJIXT6td1lxX`T`o=?J0HfI$;NL zW936jlL4#YW3xKGBVNEE2;(S(6G`P{V(UUoI%QsI1gjHInpRm+qsp0TDPWh*`L@xN zq2!5RXI>?Sk?s7ba8AqM9C?IBVOrE009my9BYs%hFLi48$Ma`1k5QQ9L`lbyYs5ft zjdtMsDX=%%RG6jydlAY?E+x<$%y{Mb@(r0~S+P&K?sb@jwsb-mI@`qSwPx6D&`c2l z^>=5cos6Ii^=|zddaax8=jellTu#uKGNTK2JS#y+=VSv7fT*YNllPn@L{cKzHQaZK z91c=q65}VYAXPT37tsu*DzZ@eE!9K?<}%6|{<=%{=|vx(8h$BKw6e`FlcEw(gIm`| zg~g`itkQ5>oEDOa#q5c$B?mWU8^7C;|B~J_md|Bu{Fw=!2QK41|3{YPFkh2VBU_~R z#_iWn#==X83H|}sKoY?%LNwvrECxfpBjU?vdW6G$jgF-`I#K@(y_Exp^Yqld8?{D} z8cwN@pr?|V>OXX26tKj>A*t3T=u7@|BR?8@B{Lj*4s~p#N(xd9d~T(5qBA7T3=?5YC;;ha0Cb7PyOe-;HX%2AXldhSDjSoDC~cmvE9YTTgG? z`TB`T*)Kn(xK)Pt*5+sWi4C-~>DwEuu422mT(b^w36ESG;R)DzEmd$X@~G6Sjf^nWBB0@V zHsDlW=PI6ti!fISU*>bp$lxtpv7FZb*CC;^=J-<`rNFn@xw#GPe&>{#<#8J`A$%5n zrY7+(a(wdVdzJ{rL`F;sZ1(%Q4_uNXxJZ>@eSF{gt-2RyIHH`;Kz(sEJ0Y9;UWspo zV*izbVJ4Q20*bJ%Dl&`MFp&NyI6A4^;ky}+g{qfA!b&OgTbE^CF>LT$hn~HdOatbH zzeR+&S+-FXgwqi_4h;>2Kz8Q2N8XX8C$9Tdyh1-jl504@wX4TCt*)_&e=Cb~U^O^) zlPEfXjq3`z&)Eq!O~kpYgUyNv`8iihi=&B7K=u(+nZ{(XN3;4cCMO3!0DzKMA4}aJ zN_6N4k?oI!UJ%ZTo75e6gWeNUY}bbFc1h*@yNq5*boCaD4%V;2J}oHLpRkt-9SsGO z3-gT$<|H~y^qlw=*BZiJdg}3|9KEKVbroSyfM`8&w$h;4zxR>L7pc@zg2PmA+#8U4 z2B;Z6Wuh&@s!X)EiA5X0pG(q>ZxP~s!h{z(k5#p@fHSj~EyTJ*oEz66EmyMd zN;N|!y(#P1AZGM~jD0ZGTG+{8etP?hS`p?vp#-CWkVWai2qmiWSN|+{q6_QE4aZts zeFt(i|7sR`3~f#D4X5MPf-M?Su<_DiygQ_(Dc#>dRPV?{ftqZ(`Dmsqlm*nZkIfHhE2=H zBroKDSp`%-2UT>kEh;Yh8 zsOMz2D|@K-8EIDqsZSFE=NX*zu9;jmO@X^xMgcwZMC}1)-kZ6JMt^S$qdpORB+)qv zG73-DNiajKQuc8jYgC}RbdBXA)l8C?s$LHx#jJDaBVFS5!M0F*%+bZK{P+V5KhuLq zL72EaUg#QX2jKPJY?wdbQ2}|lqJ^HTlCFm)V5IO(Q*>G8P|B^`t483~1>@k~P|$HJ z+2$~>8BWSupc6S0y;L@`xGFzqSMm47?Xj!tf)Nce0`-{nx49YOWkLxxZgsKl>f59l zB99Dg@=xwlUlVCoxT_1u#hBksN4KqJI}lNawGPOFvhTTpLWZPP@=5f4osdtu-Lwv`ihs#nm&|F zi8>#oFnDmOppTsS+_PyR?Jv z2-Opxu_{tiz^SR=*u+NqyAzscQMh?QxjbmXr2#NS)&ilJcC+Lk$ibs5Xm|1#ohgv$T513L zPogFpina*yw2DurS=nR)p?l2}%Sz_DRQeeMpzXV~ktLC*)%a76#n28L^W>f9oOX%E z(}>7~irwU`F&7ul*!QD6IkIGO_H0v$DiZEd=X|e|*C~PBW!-5CJJ{$jzJw1EHP&+a z82`P?-I8u-gbZR8B0A=Td&^&} z<5|;i3j65$x?e@5BVMvd4ioLHEYa7jVe0n5$n07d;(=QCvBDba&~7P;?uN0F>@`IY zYwhkNg37I>tF47jYY@w9ETg9zO72zFPR|8 zOYh(cHqboEgw1J7)NZPQ=C|(NYV~-#E1?BBkB$gcSy;0Y`+790qO^qNr!x5?x{%Sj zI1C>Dwk-Z=UuKarE+k0MX%LWddd>DHKgl`$^DsB`scv7Pes|8wedcT(t{i>0 z{#h?FRlp1w6Q#s1*w7`~I73ddWTtsT{s2yK-6y-8DzDF7&h>MR!A)cZcG2LcYU}-) z%%!T<^=1qd5ZXrBb@mD@RjQZpo4vQCfvO=^4+a36LwGJcPKpGTqn_#pDDh z;c?5(RDJYaeQR1_d@@Cer5Gp^^NfSKLZ>aFckPR+_4LblDY<-AgVk`jvGXu3<11rjjr;B$gfq-ej)Rb#~> zG4v`xav19#=m{e%u9m7<6}88F zO3Gwa=@;9lo^yxG6b2p3Z9B%*_Ay>D=xg#qaeU(?DN|D#2Nq__U`aW}I~Mmd+WzSs zen>PQRUT^axfi<%x6OT+6`@8_^-@FT-Im1*a-%QCql#oHufn0Q7XW-J3@Ph~{qSHN zQHm)WbGloHXUmnML0_m7Ii2@Cbf%W8M_+QcRO@h#r8LrP3rif_AJ)rIefb_Vr2Ss& z-Q9l~`bNBA@JgO2UxRg2ce34wKm}#_bW0+_k0tz!IbyzgJ8Y+(E(n{`-9N#;7$1%4 zel(pO)rm}+ z!M8P-Q>Y**$}!cQq0YjOUSy6Oq=;eU)!G#g)@uswFtAT$Q&|?M(Z?uAXL)3>VYVOf(J&JCFEssau$eX)s-ea{@g6%d(PJiG9>(T@z~e-Rg`qqpYak}tcdxDbJ|}p#K)h}Swq z6qxapqhnLZGuuY$tMxgt$7xYw?80IM5(sf)mRfPCOr00*KTC-}Lv(USP_*7=mFz`4 z6bQaY^}~i^tG-HivGiI<^FM)hYqrWVZN1!xV6PBCPMy==WlY0>83H zQL&A|CA&d#rqTy_4yRUd$7!aL>TWfjDI=9I_2pB9qP1ImkDX!8#h)x? zd=gzVzDIX{0U`IhIrB{KDHE`hAf`9iiE&b;ND}abw2YJ}Fp{MJCI|`6Ni0(4%=6nf zDmvnrf0A}tjMfl45@h09b#@1bt*Y-f&$JY2h!JBryYL|hz-+y zh<;>}h@L;1I@x{$t7MpH>cEnAO#r=Rlv|w0EJ8QUcvvsg&GLhNTFp>(!wJ3SOv&pQ zyn`V1-wY;}Tz9xMk~4Y_@C&X6mRl-BM zquB#a%@~(3!O_oOp8cypKT$+*k38-!QP=pD;=~jmy1an+HOtbh9L!;~O=zox0H2<*H@;v*g0plEYPVbU$nIRDCI^e5g>f7C|oQ|20Mw1nBLzt~Bc)66EFeW|?Q(g6i z<^Q#FpHEG0Z==U4p?3&KHwj4y5Rl#krG_N*UIe8#0i_Dq=q1#I(2FF5(2*|KHeI?9 zKn2k)y;!y)xE0;<%>KtE3pe-<_Ij6}vGFTpcj$hayDf3tQ_*{Ir5Al-bUaPh7F$Ry60-I2$OzX;L;hm?P) z5td%Dxa1bWGoeSz2wAEtr1E++ppsQ4;QT!588bCbrkWN5T)NMLvCT$B(|_Id2#_%# zOVkrJYeM<}HkSqahw=KH8$0v(BCp2z27$M30E`x&xL2a|D(6SYp7%9|oI%EGv8Yj$ znU;>&4us`dY0*~!S1SS4F*%F;gQ~JMlkO;igpWPNHu5^?F~HUG8pC}aQFSQ8&?rtJ z2jZs;y$*{1qGc(E$?Zf}peBtX0s(1612Ic@wAe*c&2M3Tx2^1s>cSMNi#pPjvKCQj z{Sft}&AjZ~_ncV1g=J%6*r74ozIkhh4kXd3_US^9=E_7~9C|q0VY%yhvQ^r&$x`b3 ztF1Cdb;J8H!@w6cRG+U-5wN^T_}2^9Yj3KlPlT9@F|a=#7VKbve=TmePx^42OzgRm%qj5AS~hk-q$;Tsk(z~p zIFn$RRE??E@~M`+loE$zC+(5`BYjwPiynPu! zs$$%<(z3S5VM;=>c|p+XHUUuTq<&eJ>p{U`!@PlbyS(BA->7AV1Vc4rg8M;NwB)U= zsS1Mu1ubC33R-!>N*o-)jj@!zIb`$amlN~gWKPRK+nPjT6JMLt&2de0q{P~X0ArI(`e!+@ z2;f5IyQle+ODK%m?s+qF^|wI)Evg~Z_jiW0C>#7Q9pxU|{Th3aNp9RhhR2f&DZosO zq(}KXkdbLTGhuh~%~%&@Bm5xP_yub|!4&+Y{-MMVF9oaq`UbyM6mQN|AM?n-xih}w z%bwZ(?6(WJWhm*}p2PBK5cD?zpDc!)J;p2LNo-P9-rsd9p6?syxUO9^_1zL!b9U+= zA+NfplWfs;3qQVAskm5YE@CGr3$>t)locZk4vb*+l~TbyYVsG;=nUF`=XJ@5mlz8uy22ce(SO$ zis}e{qvd;6PO7lap+T;u^DowZ623sYRGdXM&fM1!23ceZ5j=EAF(Uzg8Yh=LnJS9S z!#%5I_H!x=!Cq~!m8OQOhIbn7i=)2}EXVb1Eat!74R1!~$&>Thpk@D**$%IMEY z_@&=V;*5+-HnVYQo?pZ~!)#19mkq*&vvcHQZjx)*u~@d@PO1D3n)j%|cM@R-hzfj{ zx;Dmvt`SjrP-UltVYCn8m(oxK8xU{|!JpJ>SUoh*Ai>ps{&clkH-LvJB)>3L3f*(Y zq`X5uSl0}CcB$?G7!<@hHDyt%x&$6iC+ep3`=!84{_`Hn_~vz6zcU28|HArNek6yc zOX$%7_#>EE@}hLYG{wavV5;6AxZEnbJwo1~OhAsyZ*S8nPMsK-NghLUV1gV)f(~ad z0A6H&tENZ=SUI+SqY~O} z6K4#(uYn9yf}4M~mqVjm5W+x1BPSg(0tcSrpPWxAf&%x89$m~*4h z?Y0YLR|}A(F9OWZ#xdbEoOOb~YIa`aW5q$*5u}17(mKU#RDzQeW0sUvjV+T6TK1Yr zR`KZ2^d1uGHArk2&aSS_PF68!S$BE}OXF~p|7i(*?UE(zyD!3S0k>uBu5O$>@A^P> ziyhl|rFm!fZ{^3ni{r#s$rPL`&0t`taqTmtvJ#&{ShyBgYR^^C?2SfWQV!~NZ+y9h zXGA5NSDR%NVIgI49W5c#eOJSM!yRfQmS5?bBt^21jHOX?qNR;MpvT#6lsCl>XZj)u zIe5?Vvx|Cvu>876>C`v?J_8Pw2J6$ zu*o>@dNPIGrY4BXV-?bH`Q|AojEHtoH-F8SGz^C0#h+N3A;H2Wkj^sYO%q&=vQt3*l4*fb$f_VY znKQIlaacJ&+fl(o?O9cjSgjv;jR~CieFIX(SRk){?CDgiX0F@ zT(yOz;QJIv+dwn~{b=0&eV@aOr0o-AQ|4fbc?3>K>018d_@B-A57$@J4G&R;jqr{TV*wU!A(mlU|kP)6nf_FHl_Xl+wgCjhP&TZFo zs~VDA873v*6g7@9i-9a?0j#VORKQ1duUK@wF&+aMCk~BqYZLXY#R5Tn+~4xh{Jsgu zTWQ}rxdldgRbIJI6MGN?JP=${?^6>eFK&tlLGzK&rPp3oD-PgYgatO2U2Z~~bIl~&_XJ@aOC37j4;FxP<8O<$NWLg!&wcH#(Bk^+Eg^8I@m&qw zQlzf96_=GveC?gq^@9)qW!1BL1m0FzH$Rh zoBNpkoNru4MIK|LRjfbHQZPm?RLb1Xg}WL#XaNUa_AGxLktm@I$|=RXl)ZZ8te`BZ z5Hw&X#tEO8L=<(NIb){?%QKpQZAD9N6dDHIBC9J3L`( z8lZClWjuWC0*XuVPi8LZpIV@JIqQ&c;!@FFaO;7?p zl=1?sKno>OgHyn-$^6`peA(I&W{w1KaVeFbfn_OMuWcoOQ)7W=FBw8?$?V6W11S-j zz19X&0Oq!LSEXJkVsEgk(|$l>+=;i`v+uZl(amDpZ+Z4n1H@x!u;b1(jt;#r;2Wc3 zHDEx1@qLrD!ldF~J>1ErA`a#K@9--!{yT>@c@~FnKgmL2_o;a|2Dnfn?m^!_@wBT< zhW#PUSlNcpmk;4Eu(bqE*`4)mc<+O;oC_yzVk`Lv#-%R&f?XWN;@nJ4DqYx9ov@QU z_L->=B3HF56uYJ;WKqT=GvvNsk9XvW4?o{O<4TfjbhPTm z{CFL-_{MnC{_l0db@ddp;AbCS4b-fUahnH@R;tU*XFSVDZVem%2FLni zBjcc?@+~urbX@K!poH=g3q7ZJsg7#?T0I6f(FXKY;CD9{?W{p0;F zj}f2s`P%0*F5eHn!PhQYbG*-UYAQ{FwRN`MGIQ2+=AAoizJGH`{4i}ZE%myWF&idU z`I*;DqV(VW%9rItSI+jxEKNd>GBqjj#*X+kBqWPz)qQZ|+Sxrl?fRLnAKs4W)Wvb9 zp0ujef6(^rAdMjRjt|;`89aUfQS!6Ad#bO|Yw=J^k-#c%s&qJ!2b7q{iHO_M1T_3z znpOi>Dv`Xf^x(r4rr8QlCpjW&`Ksz5R&`-5BQU89=wcQU<)m{|J^Lfwl-ASSq3 z_h;5uzh89d_}Lw2`AWP>p>FYpX~Yu%)n7@8@A)C8Zk@4(u_Ip`-s!Z%_u z{%c>v10&iGA$~_`{5Yfh3jbOXDeXe2w7K6*PmHcXSxl!i;{Jip#(SWv5a`$e_b##i z>7}5p4{eX4%f86^`T~jiqEyWH{Pu4v1IlHSwAl^BEkvyL95Fk`VtQ_*{UTpe*rpzI zzp1u%$rjn>s3(Af%}Kf>&0U{Tng@>hlqw3D_M7lAy9D+h#ZBZlzUqBfucmPJef{37 zKq`75X06Mn?bg0PacCIpGa8wZfDmsN9#Z^I`M_CxG!uGyqGIk3IG$E*|slly(#DSO=Bz$ z18qF{ay}k^nVk1}Q1!X2r>1}L+;`!FC~u2~TY7tAf4m$qn;Q%4vmJFV5K0@BFUxDy zZ;*vc#!oI(Rc-4ob@R4;+jRmVV{*?6OJc9zWW4Vu)}*XS`+e{b5q{Ag=*|qXGlNMHbE+-_+CLZn23Z%EY<+kK>g@Bu=-e6E{WU;|0aR?6%eKzjSiLE> z{{fnOYcbWaQIhiRBdOczS+`FTf`%K7l(M|GGS@tk@fNlnxj1r#yui%TE?$Vy^_}8; z%hcVi-jZo<&g(OQQq!tC_t47qYVbMO#llpJ*lq=2Rj~WAnCk{8at2J#Nn0{}1P;UB@8|KOAniUm#c}XlO zkcGi(RhiNfX70f~2vc&$gyTk4g;Eb?I}{)9RUDeu^cPz&s>X8KUhdCQWH-8A2xes@ zI*J(vUrawRZZXvKt&TOrl&S{WNQ9WA^lC7Dz|T6^4cNJw)=Y~2+t8P6*7Dnr3Xqz# zhR`!dUR!r0YL7lx>MIQST=Yn-tBqB?01qdb2)9W3nL^xmrG4JQm8|5-MBxpU2r9G` zD4~ZXr*Dij&X;YH?{~p$Ne&&?fT{DPkLw8&&;ujvJnldkI-&EbUaCV7zVeEN z*TS!!O#2Gg4?W@HIFLb)TiLH&+kof%@Ji^<(D6UbA}VxU49-XN0QTAnbRT!Xv1JNt z!>?>v&Oy52$aH3gL^X>@?jf5U<3f8F7pWw|@GK7sgVcVtZ3Pb4E17Tr+zQLUJZ$mM zqOuB=AjKH_3%V4zvnx4Pzo3v7w(Ph9-#%pmY81`v>P`ZwM%}YoE<>Nta${aS7cu_4yDK{ajX*w0BO^ z(GRuphW4zi_$t5ZSAXh`yRgZI9;k3y+V_XwCj{YZ#kQW?!pp8eTAA*~~#FZm%e^lrgK^@ozkf@76uI|t3- z3{Slkt+dnMv16zj+R{=b12qE$nzElUr4kN}#C1lu>qY7+!W`m>=&G^E1RruPq(ew| z?@OpRR+p7CDP8b-gNJ0mz^W=gGU_v@4eV7Ei$ICTgDRBh87@^rwT=NHgAR645>`!d zPjJMx)673=aX(*^{G}@zO%tf{PnQRLIIs404aMpV{hKo?qex@TWgkwcUxwL|y2QPkYs+Wx3Zu@uJnok7ZP2xPBlZQB6YzRAEYYj*t$h%MPqTtMl z-uyqMm`syOm~R^{cLBaS#Q17R7q?&2<9zaOL(AN(rnk;BBQ0fMj1eR8dg zEZ1sjHkPGM)^=>m<)|2s?zDN+EUMsOW3}nEfdttMCa`hG7o@_x3NcfS4{N#mwF_>^ zSCH}}cu~_W;{o@@7VMMxnTB}LGxBSwX7=^1T)<#aj`g2k>_`k7cULjhij&rq+v1G! zRvW%ah2-bO>-l>e_D1;j#Jl>1u|rPvU5LAmQ)^wG3pbf?>}e^$ZDf_;M2&jNLLfZ`f5&7E^c<=KdS4U?5l&d; zWx_LF&#^D-4>VZEE4Aktz&sb;g>}KLfeAl-Xdu>GqG?KSv4{%Dc5ns(={?xtp9GNb z5fV<>zRDAGKJ>7>7_KTp5c+$jjpk{0$JS5v*ZQw>qw_jJM3a5~CL}|!f#ZvEubH2F zYO1jr5B$epdw710`157cFuv>lMaH8Pc;->aq^#^C_QR?KNht$`A{ufoH>%MJ=4wDv z=KUU$W>k405k7hqzuvk3X>s&XMCj8Unz)~ltql^H+Ebjh0IpQ8xvF{nh=B5Ixhoo& zr<GIUL-1qTs=FJjw5?W4z-zAccS{ul@33i3>q` z>D$@xqOL$3Szjp}%#HCagoZg-rE0kS{zGYF)4KW3<8l-B8w;J=uWs$Ga|A!=7c9f; zxVT=gGG&9RAf{fu`x3NFes|R7dFPS~*}1Y#%@Z9`EX!?>zp1OqC#D9^^dBB({u-Mr zlklZeEqQqFbslwscdy!#CbLg z0p`DG^@4^p03o_N${@pafa%|cz9*z?`}Ny?P(50-eh}lg8+L|=yuT%OVW|A+8^&U4 zc$&yrXbm5Tw*->(3hc}FP^4Ewb$gT_j|b`INQ%k?+Bi7jbuEm~XexU#@uP=VK=*)hRw4)eb7*44xTQj;cyb}Id9Ooo5&j!t`5C3iq{kL zml=!qk8DEDhV2K)M!P4(T45b383>#NlBSCn#L)#w2EH^QdmDwTA#T5Rf6A}bDojC< zzJz-lO&4qK=ffO7sKYR@=@2Kc50aYod)s3?gQAbFd!fQx6Rlh1cr%toE{&^tJfx5- z#@u_Rg@hvQGFRmz^1z<8$fcgZy+DZzuB&^1VwwbEM-)ap8CwZtO;aw6GUxsj$K9sR$B zRHMZs5$1&6IWLSt$^88pClV8#^52o7t zL*K<~A4JGXMUlRWj}IV#u>jJu)$M%?cH2G{(|hQ8|16&h;P4@^ zLSR!Sd~EGtgLi^+E}eN=lyKWMYEg9C?wsf}s#?2KMJJi#>~{WNre6{auU@d+Qk|{j zR!i}MSV0CeR2OQ0q#SAI4oy{&iDujx?hX@u<4ljE8|?Xs)*|4}P7{|1fB?g`@xUs_ zZ1A%Wc+GlIo=EH$MxCBXV9Vz6n;wWTJ zs<)($@R+dbZL*AA^9L-1w|#=Fx7Ktofcvi(uUw?>1(x8aD$rNmFoGf?H>}Ls^=}*L zt_y~0)=$1mB%YH=6xLkNQMw#lklnoRPzSI#>$S@+LS=Gb&XZnt48j7JTaJp>9Lt%0wITEhkH0MDQo-=FLUd54EAkFNUQ`s)rGe z6(k8x+3({=m;}J_7^_uH$Gk$0$5Gv^_3cum1_Pe8;hP);X)s*w&Kam)yc=d`)sEjM zgP319ppPwBbAOAqrF`#GVprLSsFZ_5HG%3QpmQ!d`IJmrTSSH8GkZ@U2TOtwgQ&WL zfPuWUyhX1=A!uQc(nx5_Bm?DGN?nCX5%BwyKc5pC;zsK?G6h zTT|EfSD~(gV8ml`@C7T(7^xoT&VcKM#&>06VX{yZm#t_oERGT?9zoEw#QM^ZU(Z7g z&8WF^W*#e2wFfyvrJhYAN1d8eWZGLq6s6pptuU0+??>j{vrZK@2`e&lR< z_(($ejZd-a`u7`yS@M?=KXoU(;;ku4bpzkF$q+Q_Z1&#d$GRms60Iu7?HZ7yLZ zlQo@v8jWQ%o?lV=^9P?6C zZk~9J7gj4rj(V&(QIFYDqsr{sQ?vIGHCl+8sj6gK2)vi%)h`;amm&ab-nXy|7=GuN zlWkO;!NQ;j#RURb|q205B?WnbXv1dN`A)m@?PV%>Naj;l; z{D3{#jzF%R-QMj;GuS0lMAm@OI>n2&a%X^{4isQTzN53f$f~Al9j%ndp&YVT3RLd-*0?$|DTDQ-ZaggAgg0+Ix_hup#DiB^#KWQ7Z!QT4{r@FGU=ZajB(h9 zK`H`Xl;#LLhLEse=H?ddY{H5)7E=F5CHnzs!^$+)6@>vQ1&%xr3231iXX?#WwQFXg zqaI#6K0bcvWwT=_nDL*hoO<42OkkP7&fShjpL}EVkuwYoj1&e22GA|01jeV|xwrVJ zPU+@N)Y7Ko-+o@Nv++ zT#ozE-Lmo3TDVjfciG2*HKW@W%q^VqRpV0D=il6`SZA|@be>gJw}D^x&WNBw&JKn& z*o&LHbw79yTk_2*(Kx_ep~>!f6CC7)G>v*8=8`);QhOvv-e_C6k+~i1j47uz7+|el zfyZ8w%g5PzSlF41E|@c!(2l9NxQ{mV{;I*d{`rI0#WkvLlU{07Q!Nyu&kchPwo;ag zjyKd9QeKOWvbXzFQ@QVEM=sepwhs90&JCN^TG`-yTJ&@nYh|Q$1zW|g*z`S9uRH=* zCkC~6tNbzQ`tls9tbM(-qQxuE*rmioCHViu(MWd+{rj_R2ENY>3_%PG4D1XHJRk-J z#{bALvx0H*^B%4V`NAhE4#zp;L|C&CPBnT% zCxG72sYY+;1kf8g)#weK0D42G8oi+tKyT<&qc?N{=nb7}$3JK3dkX(U^n^||`WQL^ z^oC9~dP66G-q5K=Z|DTj8#>kK4V?gbL#GK3{=<9O-bM%BxHToDj0rZAWHF`rQfZoul sMsMf@&>K3{=nb6!dPAogy`d98Z|GE`H*^B%4V`NAhE4#zp;PU@00f3w@c;k- literal 0 HcmV?d00001 diff --git a/applications/voting/vote.js b/applications/voting/vote.js index 9c4a918..60af7b7 100644 --- a/applications/voting/vote.js +++ b/applications/voting/vote.js @@ -13,7 +13,6 @@ // TODO: Documentation // TODO: Allow host voting -// TODO: Sound for new vote // TODO: Debug mode? // FIXME: Handle ties @@ -391,6 +390,8 @@ // TODO: This is still silly. Try using UUIDs per prompt and check if we are answering the same question by id? // Don't recreate the prompt if we already have the matching question if (message.prompt.question == poll.question) return; + const newPollSound = SoundCache.getSound(Script.resolvePath("./sound/new_vote.mp3")) + Audio.playSystemSound(newPollSound, {volume: 0.5}); _emitEvent({type: "poll_prompt", prompt: message.prompt}); poll.question = message.prompt.question; From 3d41dd0889191dfd7c4e8d6ae5bfa77ff26eccbf Mon Sep 17 00:00:00 2001 From: armored-dragon Date: Tue, 10 Sep 2024 15:58:25 -0500 Subject: [PATCH 25/50] Don't confirm to close poll on script ending. --- applications/voting/vote.js | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/applications/voting/vote.js b/applications/voting/vote.js index 60af7b7..24d7941 100644 --- a/applications/voting/vote.js +++ b/applications/voting/vote.js @@ -13,19 +13,16 @@ // TODO: Documentation // TODO: Allow host voting -// TODO: Debug mode? -// FIXME: Handle ties +// FIXME: Handle ties: kill both of tied results // TODO: Voting results page // TODO: Joining poll sometimes causes to double stack on other clients poll_list? -// FIXME: Closing application also prompts for user confirmation. Probably don't want that. (() => { "use strict"; let tablet; let appButton; let active = false; - let hasJoined = false; const debug = false; let poll = {id: '', title: '', description: '', host: '', question: '', options: []}; // The current poll @@ -49,7 +46,7 @@ Script.scriptEnding.connect(function () { console.log("Shutting Down"); tablet.removeButton(appButton); - deletePoll(); + deletePoll(true); }); // Overlay button toggle @@ -130,16 +127,18 @@ } // Closes the poll and return to the main menu - function deletePoll(){ + function deletePoll(bypassPrompt){ // Check to see if we are hosting the poll if (poll.host != myUuid) return; // We are not the host of this poll // We are in a poll if (poll.id == '') return; - var answer = Window.confirm('Are you sure you want to close the poll?') - - if (!answer) return; + // Confirm to user if they want to close the poll + if (!bypassPrompt) { + var answer = Window.confirm('Are you sure you want to close the poll?') + if (!answer) return; + } console.log("Closing active poll"); From 39b13616afa13fbb94a291eb9620d919191bcba8 Mon Sep 17 00:00:00 2001 From: armored-dragon Date: Wed, 11 Sep 2024 16:00:58 -0500 Subject: [PATCH 26/50] Host voting --- applications/voting/vote.js | 39 +++-- applications/voting/vote.qml | 290 +++++++++++++++++++++++++++++++---- 2 files changed, 284 insertions(+), 45 deletions(-) diff --git a/applications/voting/vote.js b/applications/voting/vote.js index 24d7941..ad0ec62 100644 --- a/applications/voting/vote.js +++ b/applications/voting/vote.js @@ -17,6 +17,7 @@ // TODO: Voting results page // TODO: Joining poll sometimes causes to double stack on other clients poll_list? +// TODO: Do active polls persist across domain leave? If so close them on session leave (() => { "use strict"; @@ -25,7 +26,7 @@ let active = false; const debug = false; - let poll = {id: '', title: '', description: '', host: '', question: '', options: []}; // The current poll + let poll = {id: '', title: '', description: '', host: '', question: '', options: [], host_can_vote: false}; // The current poll let responses = {}; // All ballots received and to be used by the election function. let electionIterations = 0; // How many times the election function has been called to narrow down a candidate. @@ -117,13 +118,6 @@ // Update the UI screen _emitEvent({type: "create_poll"}); - - // Debug: Create a lot of fake ballots - if (!debug) return; - - for (let i = 0; i < 25; ++i) { - _debugDummyBallot(); - } } // Closes the poll and return to the main menu @@ -200,9 +194,6 @@ function emitPrompt(){ if (poll.host != myUuid) return; // We are not the host of this poll - console.log(`Clearing responses`) - responses = {} - console.log(`Emitting prompt`); Messages.sendMessage(poll.id, JSON.stringify({type: "poll_prompt", prompt: {question: poll.question, options: poll.options}})); } @@ -252,6 +243,7 @@ // NOTE: Has to be *over* 50%. if (sortedObject[Object.keys(sortedObject)[0]] > majority) { // Show dialog of election statistics + Messages.sendMessage(poll.id, JSON.stringify({type: "poll_winner", winner: Object.keys(sortedObject)[0], rounds: electionIterations, votesCounted: totalVotes})); console.log(`\nWinner: ${Object.keys(sortedObject)[0]}\nElection rounds: ${electionIterations}\nVotes counted: ${totalVotes}`); return; // Winner was selected. We are done! }; @@ -287,9 +279,9 @@ function _debugDummyBallot() { if (!debug) return; // Just incase... - let ballot = getRandomOrder('C1', 'C2', 'C3', 'C4', 'C5', 'C6'); - - responses[Object.keys(responses).length.toString()] = ballot; + let ballot = getRandomOrder(...poll.options); + const responsesKeyName = Object.keys(responses).length.toString(); + responses[responsesKeyName] = ballot; function getRandomOrder(...words) { for (let i = words.length - 1; i > 0; i--) { @@ -320,9 +312,17 @@ case "prompt": poll.question = event.prompt.question; poll.options = event.prompt.options; + poll.host_can_vote = event.host_can_vote emitPrompt(); break; case "run_election": + // Debug: Create a lot of fake ballots + if (debug) { + for (let i = 0; i < 25; ++i) { + _debugDummyBallot(); + } + } + preformElection(); break; } @@ -383,14 +383,16 @@ // Received poll information if (message.type == "poll_prompt") { - if (poll.host == myUuid) return; // We are the host of this poll console.log(`Prompt:\n ${JSON.stringify(message.prompt)}`); // TODO: This is still silly. Try using UUIDs per prompt and check if we are answering the same question by id? // Don't recreate the prompt if we already have the matching question - if (message.prompt.question == poll.question) return; + if (message.prompt.question == poll.question && !poll.host_can_vote) return; + + // Play sound for new poll const newPollSound = SoundCache.getSound(Script.resolvePath("./sound/new_vote.mp3")) Audio.playSystemSound(newPollSound, {volume: 0.5}); + _emitEvent({type: "poll_prompt", prompt: message.prompt}); poll.question = message.prompt.question; @@ -410,6 +412,11 @@ // console.log(JSON.stringify(responses)); } + // Winner was broadcasted + if (message.type == "poll_winner") { + _emitEvent({type: "poll_winner", winner: message.winner, rounds: message.rounds, votesCounted: message.votes}); + } + } } diff --git a/applications/voting/vote.qml b/applications/voting/vote.qml index bb77114..17be45a 100644 --- a/applications/voting/vote.qml +++ b/applications/voting/vote.qml @@ -1,5 +1,5 @@ import QtQuick 2.7 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.15 import QtQuick.Layouts 1.3 import controlsUit 1.0 as HifiControlsUit @@ -10,9 +10,11 @@ Rectangle { height: 700 id: root - // property string current_page: "poll_host_view" + // property string current_page: "poll_results" property string current_page: "poll_list" + property bool host_can_vote: false + property bool is_host: false // Poll List view ColumnLayout { @@ -121,6 +123,26 @@ Rectangle { } + RowLayout { + width: parent.width + + Text { + text: "Allow host voting" + color:"white" + font.pointSize: 12 + Layout.fillWidth: true + } + + CheckBox { + width: 30 + height: 25 + checked: false + onToggled: { + host_can_vote = checked + } + } + } + // Submit button RowLayout { @@ -239,7 +261,7 @@ Rectangle { } } - // Add Option Button + // Host actions ColumnLayout { anchors.horizontalCenter: parent.horizontalCenter width: parent.width @@ -249,6 +271,7 @@ Rectangle { width: parent.width anchors.horizontalCenter: parent.horizontalCenter + // Close poll Rectangle { width: 150 height: 40 @@ -269,6 +292,7 @@ Rectangle { } } + // Add poll option Rectangle { width: 40 height: 40 @@ -289,6 +313,7 @@ Rectangle { } } + // Submit the poll to the users Rectangle { width: 150 height: 40 @@ -312,32 +337,12 @@ Rectangle { options.push(element.option) } - toScript({type: "prompt", prompt: {question: poll_to_respond_title.text, options: options}}) - } - } - } - } + // Send the prompt to the server + toScript({type: "prompt", prompt: {question: poll_to_respond_title.text, options: options}, host_can_vote: host_can_vote}); - RowLayout { - width: parent.width - anchors.horizontalCenter: parent.horizontalCenter - - Rectangle { - width: 150 - height: 40 - color: "#1c71d8" - - Text { - anchors.centerIn: parent - text:"Run Election" - color: "white" - font.pointSize:18 - } - - MouseArea { - anchors.fill: parent - onClicked: { - toScript({type: "run_election"}) + // If the host can vote, change the screen to the client view to allow the vote + if (host_can_vote) current_page = "poll_client_view"; + else current_page = "poll_results" } } } @@ -441,6 +446,7 @@ Rectangle { // TODO: Turn into function and move to root + // TODO: Validate responses onClicked: { var votes = {}; var orderedArray = []; @@ -470,6 +476,9 @@ Rectangle { // Send our ballot to the host (by sending it to everyone in the poll lol) toScript({type: "cast_vote", ballot: onlyNames}); + + // Change screen to results screen + current_page = "poll_results" } } } @@ -477,6 +486,218 @@ Rectangle { } } + // Poll results + ColumnLayout { + width: parent.width + height: parent.height - 40 + visible: current_page == "poll_results" + + // Header + Item { + height: 100 + Layout.fillWidth: true + + Rectangle { + color: "black" + anchors.fill: parent + } + + Text { + width: parent.width + text: "Winner" + color: "gray" + font.pointSize: 12 + wrapMode: Text.NoWrap + horizontalAlignment: Text.AlignHCenter + verticalAlignment: Text.AlignVCenter + y: 20 + } + Text { + id: poll_winner + width: parent.width + text: "Me" + color: "white" + font.pointSize: 20 + wrapMode: Text.NoWrap + anchors.top: parent.children[1].bottom + horizontalAlignment: Text.AlignHCenter + verticalAlignment: Text.AlignVCenter + } + } + + Item { + Layout.fillHeight: true + Layout.fillWidth: true + + ColumnLayout { + Layout.fillHeight: true + width: parent.width - 40 + anchors.horizontalCenter: parent.horizontalCenter + + RowLayout { + width: parent.width + + Text { + text: "Votes recived:" + color: "gray" + Layout.fillWidth: true + font.pointSize: 12 + } + Text { + text: "0" + color: "white" + font.pointSize: 14 + } + } + + RowLayout { + width: parent.width + + Text { + text: "Iterations:" + color: "gray" + Layout.fillWidth: true + font.pointSize: 12 + } + Text { + text: "-" + color: "white" + font.pointSize: 14 + } + } + } + } + + // TODO: Style: Not centered. Remake. + // Host actions + RowLayout { + visible: is_host + width: parent.width + anchors.horizontalCenter: parent.horizontalCenter + + // Recast vote + Rectangle { + width: 150 + height: 40 + color: "#c0bfbc" + visible: (is_host && host_can_vote) || !is_host + + Text { + anchors.centerIn: parent + text:"Recast Vote" + color: "black" + font.pointSize:18 + } + + MouseArea { + anchors.fill: parent + onClicked: { + current_page = "poll_client_view" + } + } + } + } + + // Host actions + RowLayout { + visible: is_host + width: parent.width + anchors.horizontalCenter: parent.horizontalCenter + + // Preform Election + Rectangle { + width: 150 + height: 40 + color: "#c0bfbc" + + Text { + anchors.centerIn: parent + text:"Tally Votes" + color: "black" + font.pointSize:18 + } + + MouseArea { + anchors.fill: parent + onClicked: { + toScript({type: "run_election"}) + } + } + } + + // Preform Election + Rectangle { + width: 150 + height: 40 + color: "#c0bfbc" + + Text { + anchors.centerIn: parent + text:"Poll Settings" + color: "black" + font.pointSize:18 + } + + MouseArea { + anchors.fill: parent + onClicked: { + } + } + } + } + + // TODO: View a list of the ballots and the results of the election rounds + // Item { + // Layout.fillHeight: true + // Layout.fillWidth: true + + // // TODO: Allow scrolling + // ScrollView { + // // ScrollBar.horizontal.policy: ScrollBar.AlwaysOn + // // ScrollBar.vertical.policy: ScrollBar.AlwaysOff + // clip: true + // width: parent.width + // height: parent.height + + // ColumnLayout { + // Repeater { + // model: 3 + // ColumnLayout { + // Text { + // text: "Round "+ index +": Eleminated XXX" + // font.pointSize: 18 + // color: "white" + // } + + // Repeater { + // model: 20 + + // RowLayout { + // height: 30 + + // Repeater { + // model: 4 + // Item { + // width: 100 + // height: 30 + + // Text { + // text: 'One ' + index + // color: "white" + // font.pointSize: 12 + // width: parent.width - 10 + // } + // } + // } + // } + // } + // } + // } + // } + // } + // } + } + // Templates // Active poll listing @@ -681,11 +902,15 @@ Rectangle { // Switch view to the create poll view case "create_poll": // Reset poll host page - poll_to_respond_title.text = "Prompt" + poll_to_respond_title.text = "" poll_option_model_host.clear(); // Show host page current_page = "poll_host_view"; + + // Set variables + is_host = true + break; // Add poll info to the list of active polls @@ -720,6 +945,10 @@ Rectangle { active_polls.remove(i); } } + + // Set variables + is_host = false + break; // Open the host view @@ -735,6 +964,9 @@ Rectangle { poll_option_model_host.append({option: option}) } break; + case "poll_winner": + poll_winner.text = message.winner + break; } } From 3067deab63e93a02c95c1ee9b6c8027e005714ee Mon Sep 17 00:00:00 2001 From: armored-dragon Date: Wed, 11 Sep 2024 16:09:15 -0500 Subject: [PATCH 27/50] Fix recast vote on client. Added poll settings host button functionality. --- applications/voting/vote.qml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/applications/voting/vote.qml b/applications/voting/vote.qml index 17be45a..db082a8 100644 --- a/applications/voting/vote.qml +++ b/applications/voting/vote.qml @@ -569,9 +569,8 @@ Rectangle { } // TODO: Style: Not centered. Remake. - // Host actions + // Client actions RowLayout { - visible: is_host width: parent.width anchors.horizontalCenter: parent.horizontalCenter @@ -580,7 +579,7 @@ Rectangle { width: 150 height: 40 color: "#c0bfbc" - visible: (is_host && host_can_vote) || !is_host + visible: ((is_host && host_can_vote) || !is_host) Text { anchors.centerIn: parent @@ -625,7 +624,7 @@ Rectangle { } } - // Preform Election + // Return to poll settings Rectangle { width: 150 height: 40 @@ -641,6 +640,7 @@ Rectangle { MouseArea { anchors.fill: parent onClicked: { + current_page = "poll_host_view" } } } From e00e78aa24791e3fd6cc731fea6474e3756a2e34 Mon Sep 17 00:00:00 2001 From: armored-dragon Date: Thu, 12 Sep 2024 02:57:17 -0500 Subject: [PATCH 28/50] Fixed votes counted not being counted. --- applications/voting/vote.js | 15 +++++++- applications/voting/vote.qml | 75 ++++++++++++------------------------ 2 files changed, 37 insertions(+), 53 deletions(-) diff --git a/applications/voting/vote.js b/applications/voting/vote.js index ad0ec62..39cd1f4 100644 --- a/applications/voting/vote.js +++ b/applications/voting/vote.js @@ -18,6 +18,7 @@ // TODO: Voting results page // TODO: Joining poll sometimes causes to double stack on other clients poll_list? // TODO: Do active polls persist across domain leave? If so close them on session leave +// FIXME: Empty arrays in responses don't count as valid votes anymore? Causes miscounts? (() => { "use strict"; @@ -280,6 +281,10 @@ function _debugDummyBallot() { if (!debug) return; // Just incase... let ballot = getRandomOrder(...poll.options); + + const indexToRemove = Math.floor(Math.random() * ballot.length); + ballot.splice(indexToRemove, 1); + const responsesKeyName = Object.keys(responses).length.toString(); responses[responsesKeyName] = ballot; @@ -288,6 +293,7 @@ const j = Math.floor(Math.random() * (i + 1)); [words[i], words[j]] = [words[j], words[i]]; } + return words; } } @@ -398,6 +404,10 @@ poll.question = message.prompt.question; } + if (message.type == "vote_count") { + _emitEvent({type: "received_vote", voteCount: message.voteCount}); + } + // Received a ballot if (message.type == "vote") { // Check if we are the host @@ -409,12 +419,13 @@ // Emit a echo so the voter knows we have received it // TODO: - // console.log(JSON.stringify(responses)); + // Broadcast the updated count to all clients + Messages.sendMessage(poll.id, JSON.stringify({type: "vote_count", voteCount: Object.keys(responses).length})); } // Winner was broadcasted if (message.type == "poll_winner") { - _emitEvent({type: "poll_winner", winner: message.winner, rounds: message.rounds, votesCounted: message.votes}); + _emitEvent({type: "poll_winner", winner: message.winner, rounds: message.rounds, votesCounted: message.votesCounted}); } } diff --git a/applications/voting/vote.qml b/applications/voting/vote.qml index db082a8..a5db3a4 100644 --- a/applications/voting/vote.qml +++ b/applications/voting/vote.qml @@ -544,12 +544,30 @@ Rectangle { font.pointSize: 12 } Text { + id: tally_votes_received text: "0" color: "white" font.pointSize: 14 } } + RowLayout { + width: parent.width + + Text { + text: "Votes counted:" + color: "gray" + Layout.fillWidth: true + font.pointSize: 12 + } + Text { + id: tally_votes_counted + text: "-" + color: "white" + font.pointSize: 14 + } + } + RowLayout { width: parent.width @@ -560,6 +578,7 @@ Rectangle { font.pointSize: 12 } Text { + id: tally_votes_itterations text: "-" color: "white" font.pointSize: 14 @@ -645,57 +664,6 @@ Rectangle { } } } - - // TODO: View a list of the ballots and the results of the election rounds - // Item { - // Layout.fillHeight: true - // Layout.fillWidth: true - - // // TODO: Allow scrolling - // ScrollView { - // // ScrollBar.horizontal.policy: ScrollBar.AlwaysOn - // // ScrollBar.vertical.policy: ScrollBar.AlwaysOff - // clip: true - // width: parent.width - // height: parent.height - - // ColumnLayout { - // Repeater { - // model: 3 - // ColumnLayout { - // Text { - // text: "Round "+ index +": Eleminated XXX" - // font.pointSize: 18 - // color: "white" - // } - - // Repeater { - // model: 20 - - // RowLayout { - // height: 30 - - // Repeater { - // model: 4 - // Item { - // width: 100 - // height: 30 - - // Text { - // text: 'One ' + index - // color: "white" - // font.pointSize: 12 - // width: parent.width - 10 - // } - // } - // } - // } - // } - // } - // } - // } - // } - // } } @@ -966,6 +934,11 @@ Rectangle { break; case "poll_winner": poll_winner.text = message.winner + tally_votes_itterations.text = message.rounds + tally_votes_counted.text = message.votesCounted + break; + case "received_vote": + tally_votes_received.text = message.voteCount break; } } From 282c27ccb9abd2a9a8ee911098a380acdb052518 Mon Sep 17 00:00:00 2001 From: armored-dragon Date: Thu, 12 Sep 2024 03:04:32 -0500 Subject: [PATCH 29/50] Fixed double listing polls? --- applications/voting/vote.js | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/applications/voting/vote.js b/applications/voting/vote.js index 39cd1f4..8e373d5 100644 --- a/applications/voting/vote.js +++ b/applications/voting/vote.js @@ -12,10 +12,8 @@ /* global Script Tablet Messages MyAvatar Uuid*/ // TODO: Documentation -// TODO: Allow host voting // FIXME: Handle ties: kill both of tied results -// TODO: Voting results page // TODO: Joining poll sometimes causes to double stack on other clients poll_list? // TODO: Do active polls persist across domain leave? If so close them on session leave // FIXME: Empty arrays in responses don't count as valid votes anymore? Causes miscounts? @@ -30,6 +28,7 @@ let poll = {id: '', title: '', description: '', host: '', question: '', options: [], host_can_vote: false}; // The current poll let responses = {}; // All ballots received and to be used by the election function. let electionIterations = 0; // How many times the election function has been called to narrow down a candidate. + let activePolls = []; // All active polls. const url = Script.resolvePath("./vote.qml"); const myUuid = generateUUID(MyAvatar.sessionUUID); @@ -362,10 +361,12 @@ // Received an active poll if (message.type == "active_poll") { - // If we are not connected to a poll, list polls in the UI - if (poll.id == '') { - _emitEvent({type: "new_poll", poll: message.poll}); - } + if (poll.id != '') return; // We are in a poll, don't populate the list + + if (activePolls.indexOf(message.poll.id) != -1) return; // We already have that poll in the list + + _emitEvent({type: "new_poll", poll: message.poll}); + activePolls.push(message.poll.id); } // Polls closed :) @@ -377,6 +378,7 @@ // Unregister self from poll if (isOurPoll) leavePoll(); + activePolls.splice(activePolls.indexOf(message.poll.id), 1); // Remove from active list } break; From fe74545620b6f31f0d82806473e564ea10234d0c Mon Sep 17 00:00:00 2001 From: armored-dragon Date: Thu, 12 Sep 2024 03:25:52 -0500 Subject: [PATCH 30/50] Close and leave polls on session leave. --- applications/voting/vote.js | 25 ++++++++++++++++++------- applications/voting/vote.qml | 13 ++++++++++++- 2 files changed, 30 insertions(+), 8 deletions(-) diff --git a/applications/voting/vote.js b/applications/voting/vote.js index 8e373d5..3835d55 100644 --- a/applications/voting/vote.js +++ b/applications/voting/vote.js @@ -14,9 +14,9 @@ // TODO: Documentation // FIXME: Handle ties: kill both of tied results -// TODO: Joining poll sometimes causes to double stack on other clients poll_list? -// TODO: Do active polls persist across domain leave? If so close them on session leave // FIXME: Empty arrays in responses don't count as valid votes anymore? Causes miscounts? +// FIXME: Host closes window does not return them to client view when applicable +// FIXME: Sound playing on every user join. (() => { "use strict"; @@ -50,6 +50,8 @@ deletePoll(true); }); + AvatarList.avatarSessionChangedEvent.connect(_resetNetworking); + // Overlay button toggle appButton.clicked.connect(toolbarButtonClicked); tablet.fromQml.connect(fromQML); @@ -143,7 +145,7 @@ _emitEvent({type: "close_poll", poll: {id: poll.id}, change_page: true}); // Clear our active poll data - poll = { host: '', title: '', description: '', id: '', question: '', options: []}; + _resetNetworking(); } // Join an existing poll hosted by another user @@ -168,13 +170,12 @@ // Leave a poll hosted by another user function leavePoll() { + if (!poll.id) return; // No poll to leave + let pollToLeave = poll.id; - // Unsubscribe from message mixer for poll information - Messages.unsubscribe(poll.id); - // Clear poll - poll = {id: '', host: ''}; + _resetNetworking(); console.log(`Successfully left ${pollToLeave}`); } @@ -297,6 +298,16 @@ } } + // Reset application "networking" information to default values + function _resetNetworking(){ + if (poll.id) Messages.unsubscribe(poll.id); + + poll = {id: '', title: '', description: '', host: '', question: '', options: [], host_can_vote: false}; + responses = {}; + electionIterations = 0; + activePolls = []; + } + // Communication function fromQML(event) { console.log(`New QML event:\n${JSON.stringify(event)}`); diff --git a/applications/voting/vote.qml b/applications/voting/vote.qml index a5db3a4..4f9ccb3 100644 --- a/applications/voting/vote.qml +++ b/applications/voting/vote.qml @@ -515,7 +515,7 @@ Rectangle { Text { id: poll_winner width: parent.width - text: "Me" + text: "---" color: "white" font.pointSize: 20 wrapMode: Text.NoWrap @@ -864,6 +864,13 @@ Rectangle { } } + function _clearResults(){ + poll_winner.text = "---" + tally_votes_itterations.text = "-" + tally_votes_counted.text = "-" + tally_votes_received.text = "0" + } + // Messages from script function fromScript(message) { switch (message.type){ @@ -899,6 +906,10 @@ Rectangle { console.log("adding option "+ option); poll_option_model.append({option: option, rank: 0}) } + + // Clear the results page + _clearResults() + // Set the options break; From 0bb41ebb95d3707a9777ab3c5612e985b390563b Mon Sep 17 00:00:00 2001 From: armored-dragon Date: Thu, 12 Sep 2024 03:47:14 -0500 Subject: [PATCH 31/50] Minor sound improvement. --- applications/voting/vote.js | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/applications/voting/vote.js b/applications/voting/vote.js index 3835d55..5717ce2 100644 --- a/applications/voting/vote.js +++ b/applications/voting/vote.js @@ -13,10 +13,10 @@ // TODO: Documentation // FIXME: Handle ties: kill both of tied results +// FIXME: Handle ties: Last two standing are tied. // FIXME: Empty arrays in responses don't count as valid votes anymore? Causes miscounts? // FIXME: Host closes window does not return them to client view when applicable -// FIXME: Sound playing on every user join. (() => { "use strict"; @@ -308,6 +308,15 @@ activePolls = []; } + function _emitSound(type){ + switch (type) { + case "new_prompt": + const newPollSound = SoundCache.getSound(Script.resolvePath("./sound/new_vote.mp3")) + Audio.playSystemSound(newPollSound, {volume: 0.5}); + break; + } + } + // Communication function fromQML(event) { console.log(`New QML event:\n${JSON.stringify(event)}`); @@ -396,7 +405,6 @@ case poll.id: // Received poll request if (message.type == "join") { - // FIXME: Does not work! emitPrompt(); } @@ -409,8 +417,7 @@ if (message.prompt.question == poll.question && !poll.host_can_vote) return; // Play sound for new poll - const newPollSound = SoundCache.getSound(Script.resolvePath("./sound/new_vote.mp3")) - Audio.playSystemSound(newPollSound, {volume: 0.5}); + _emitSound("new_prompt"); _emitEvent({type: "poll_prompt", prompt: message.prompt}); From a175102473c0592e4efdde1cf9f09fc0e4f0b47e Mon Sep 17 00:00:00 2001 From: armored-dragon Date: Thu, 12 Sep 2024 15:59:01 -0500 Subject: [PATCH 32/50] Fixed election engine. Create new prompt. Was not maintaining the order of data causing unexpected eliminations. Host can now ask new question in same session. --- applications/voting/vote.js | 95 ++++++++++++++++++++---------------- applications/voting/vote.qml | 40 +++++++++++++-- 2 files changed, 89 insertions(+), 46 deletions(-) diff --git a/applications/voting/vote.js b/applications/voting/vote.js index 5717ce2..f566525 100644 --- a/applications/voting/vote.js +++ b/applications/voting/vote.js @@ -15,8 +15,8 @@ // FIXME: Handle ties: kill both of tied results // FIXME: Handle ties: Last two standing are tied. -// FIXME: Empty arrays in responses don't count as valid votes anymore? Causes miscounts? // FIXME: Host closes window does not return them to client view when applicable +// FIXME: User joining in poll results mode causes window to switch to vote mode only if host can vote (() => { "use strict"; @@ -203,69 +203,79 @@ // TODO: Simplify logging of critical information // FIXME: Recursive function call function preformElection(){ - let firstVotes = []; - let voteObject = {}; - - // TODO: Debug total votes at beginning of election vs ending - + let firstVotes = []; // List of first choices from every ballot + let voteResults = {}; // Object that stores the total amount of votes each candidate gets + + // Don't run election if we don't have any votes. + if (Object.keys(responses).length == 0) return; + + // Go though each vote received and get the most preferred candidate per ballot. Object.keys(responses).forEach((key) => { let uuid = key; let vote = responses[uuid]; - + // Assign first vote to new array firstVotes.push(vote[0]); }); - + + // Go through each first choice and increment the total amount of votes per candidate. for (let i = 0; i < firstVotes.length; i++) { + let candidate = firstVotes[i]; + // Check if firstVotes index exists - if (!firstVotes[i]) firstVotes[i] = -1; // FIXME: We need a special case for "Non-vote" or "Vacant?" - - // Create voteObject index if it does not exist - if (!voteObject[firstVotes[i]]) voteObject[firstVotes[i]] = 0; - + if (!candidate) candidate = -1; // If we have received a "no-vote", just assign -1 + + // Create voteResults index if it does not exist + if (!voteResults[candidate]) voteResults[candidate] = 0; + // Increment value for each vote - voteObject[firstVotes[i]]++ + voteResults[candidate]++ + } + + const totalVotes = Object.keys(responses).length; // Total votes to expect to be counted. + const majority = Math.floor(totalVotes / 2); // Minimum value to be considered a majority + + const sortedArray = Object.entries(voteResults).sort((a, b) => b[1] - a[1]); + let sortedObject = []; + for (const [key, value] of sortedArray) { + sortedObject.push({ [key]: value }); } - // Don't run election if we don't have any votes. - if (firstVotes.length == 0) return; - - console.log(`Votes: ${JSON.stringify(voteObject, null, 4)}`); - - // Check to see if there is a majority vote - let totalVotes = Object.keys(responses).length; // TODO: Check to make sure this value never changes. - let majority = Math.floor(totalVotes / 2); - - // Sort the voteObject by value in descending order - const sortedArray = Object.entries(voteObject).sort(([, a], [, b]) => b - a); // FIXME: This works but looks ugly - const sortedObject = Object.fromEntries(sortedArray); - + console.log(`Iteration Votes: ${JSON.stringify(sortedObject, null, 2)}`); + // Check the most voted for option to see if it makes up over 50% of votes // NOTE: Has to be *over* 50%. - if (sortedObject[Object.keys(sortedObject)[0]] > majority) { - // Show dialog of election statistics - Messages.sendMessage(poll.id, JSON.stringify({type: "poll_winner", winner: Object.keys(sortedObject)[0], rounds: electionIterations, votesCounted: totalVotes})); - console.log(`\nWinner: ${Object.keys(sortedObject)[0]}\nElection rounds: ${electionIterations}\nVotes counted: ${totalVotes}`); + if (sortedObject[0][Object.keys(sortedObject[0])[0]] > majority) { + let winnerName = Object.keys(sortedObject[0])[0]; + if (winnerName == '-1') winnerName = "No vote"; + Messages.sendMessage(poll.id, JSON.stringify({type: "poll_winner", winner: winnerName, rounds: electionIterations, votesCounted: totalVotes})); + console.log(`\nWinner: ${winnerName}\nElection rounds: ${electionIterations}\nVotes counted: ${totalVotes}`); + responses = {}; return; // Winner was selected. We are done! }; - + // If there is not a majority vote, remove the least popular candidate and call preformElection() again - let leastPopularIndex = Object.keys(sortedObject).length - 1; - let leastPopular = Object.keys(sortedObject)[leastPopularIndex]; - - console.log(`Removing least popular: ${JSON.stringify(leastPopular, null, 4)}`); + let leastPopularIndex = sortedObject.length - 1; + let leastPopular = Object.keys(sortedObject[leastPopularIndex])[0]; + // Check to see if least popular is "-1"/"no-vote" + if (leastPopular === "-1") { + leastPopularIndex--; + leastPopular = Object.keys(sortedObject[leastPopularIndex])[0]; // Get the real leastPopular candidate + } + + console.log(`Removing least popular: ${leastPopular}`); + // Go into each vote and delete the selected least popular candidate - Object.keys(responses).forEach((key) => { - let uuid = key; + Object.keys(responses).forEach((uuid) => { // Remove the least popular candidate from each vote. - responses[uuid].splice(responses[uuid].indexOf(leastPopular), 1); + if (responses[uuid].indexOf(leastPopular) != -1) responses[uuid].splice(responses[uuid].indexOf(leastPopular), 1); console.log(responses[uuid]); }); - + // Update statistics electionIterations++; - + // Run again preformElection(); } @@ -283,7 +293,7 @@ let ballot = getRandomOrder(...poll.options); const indexToRemove = Math.floor(Math.random() * ballot.length); - ballot.splice(indexToRemove, 1); + ballot.splice(indexToRemove, ballot.length - indexToRemove); const responsesKeyName = Object.keys(responses).length.toString(); responses[responsesKeyName] = ballot; @@ -348,6 +358,7 @@ } } + electionIterations = 0; preformElection(); break; } diff --git a/applications/voting/vote.qml b/applications/voting/vote.qml index 4f9ccb3..b113c35 100644 --- a/applications/voting/vote.qml +++ b/applications/voting/vote.qml @@ -15,6 +15,7 @@ Rectangle { property string current_page: "poll_list" property bool host_can_vote: false property bool is_host: false + property bool votes_tallied: false // Poll List view ColumnLayout { @@ -624,6 +625,7 @@ Rectangle { // Preform Election Rectangle { + visible: !votes_tallied width: 150 height: 40 color: "#c0bfbc" @@ -638,13 +640,15 @@ Rectangle { MouseArea { anchors.fill: parent onClicked: { - toScript({type: "run_election"}) + toScript({type: "run_election"}); + votes_tallied = true; } } } // Return to poll settings Rectangle { + visible: !votes_tallied width: 150 height: 40 color: "#c0bfbc" @@ -663,6 +667,31 @@ Rectangle { } } } + + // Make a new question + Rectangle { + visible: is_host && votes_tallied + width: 150 + height: 40 + color: "#c0bfbc" + + Text { + anchors.centerIn: parent + text:"Next poll" + color: "black" + font.pointSize:18 + } + + MouseArea { + anchors.fill: parent + onClicked: { + _clearHost(); + _clearResults(); + current_page = "poll_host_view"; + votes_tallied = false; + } + } + } } } @@ -871,14 +900,17 @@ Rectangle { tally_votes_received.text = "0" } + function _clearHost(){ + poll_to_respond_title.text = "" + poll_option_model_host.clear(); + } + // Messages from script function fromScript(message) { switch (message.type){ // Switch view to the create poll view case "create_poll": - // Reset poll host page - poll_to_respond_title.text = "" - poll_option_model_host.clear(); + _clearHost() // Show host page current_page = "poll_host_view"; From 202198cbc583414c97b5d8ddaecc799ecc946295 Mon Sep 17 00:00:00 2001 From: armored-dragon Date: Thu, 12 Sep 2024 16:16:08 -0500 Subject: [PATCH 33/50] Fix host window reset if can vote and user join. Fixed recast vote if already tallied. --- applications/voting/vote.js | 2 +- applications/voting/vote.qml | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/applications/voting/vote.js b/applications/voting/vote.js index f566525..3b95a52 100644 --- a/applications/voting/vote.js +++ b/applications/voting/vote.js @@ -12,11 +12,11 @@ /* global Script Tablet Messages MyAvatar Uuid*/ // TODO: Documentation +// FIXME: Reset create_poll view when switching screens // FIXME: Handle ties: kill both of tied results // FIXME: Handle ties: Last two standing are tied. // FIXME: Host closes window does not return them to client view when applicable -// FIXME: User joining in poll results mode causes window to switch to vote mode only if host can vote (() => { "use strict"; diff --git a/applications/voting/vote.qml b/applications/voting/vote.qml index b113c35..bee2e85 100644 --- a/applications/voting/vote.qml +++ b/applications/voting/vote.qml @@ -593,6 +593,7 @@ Rectangle { RowLayout { width: parent.width anchors.horizontalCenter: parent.horizontalCenter + visible: !votes_tallied // Recast vote Rectangle { @@ -927,7 +928,6 @@ Rectangle { // Populate the client view of the current question and options case "poll_prompt": - current_page = "poll_client_view"; active_polls_list.index_selected = -1; // Unselect whatever poll was selected (If one was selected) // Clear options poll_option_model.clear(); @@ -939,6 +939,10 @@ Rectangle { poll_option_model.append({option: option, rank: 0}) } + if (is_host) return; + + current_page = "poll_client_view"; + // Clear the results page _clearResults() @@ -979,6 +983,7 @@ Rectangle { poll_winner.text = message.winner tally_votes_itterations.text = message.rounds tally_votes_counted.text = message.votesCounted + votes_tallied = true break; case "received_vote": tally_votes_received.text = message.voteCount From 8a6f7dd39448e1db2426d20b63da6b304e013d38 Mon Sep 17 00:00:00 2001 From: armored-dragon Date: Fri, 13 Sep 2024 00:25:26 -0500 Subject: [PATCH 34/50] Don't allow late votes. Clear poll create screen. --- applications/voting/vote.js | 8 +++++++- applications/voting/vote.qml | 11 ++++++++++- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/applications/voting/vote.js b/applications/voting/vote.js index 3b95a52..c1df777 100644 --- a/applications/voting/vote.js +++ b/applications/voting/vote.js @@ -12,7 +12,6 @@ /* global Script Tablet Messages MyAvatar Uuid*/ // TODO: Documentation -// FIXME: Reset create_poll view when switching screens // FIXME: Handle ties: kill both of tied results // FIXME: Handle ties: Last two standing are tied. @@ -29,6 +28,7 @@ let responses = {}; // All ballots received and to be used by the election function. let electionIterations = 0; // How many times the election function has been called to narrow down a candidate. let activePolls = []; // All active polls. + let winnerSelected = false; // Whether or not the election function has selected a winner for the active poll const url = Script.resolvePath("./vote.qml"); const myUuid = generateUUID(MyAvatar.sessionUUID); @@ -187,6 +187,9 @@ // Check if poll is valid if (poll == undefined || poll.id == '') return; + // Check if a winner was already chosen + if (winnerSelected) return; + // Send vote to users in poll Messages.sendMessage(poll.id, JSON.stringify({type: "vote", ballot: event.ballot, uuid: myUuid})); } @@ -433,6 +436,8 @@ _emitEvent({type: "poll_prompt", prompt: message.prompt}); poll.question = message.prompt.question; + + winnerSelected = false; } if (message.type == "vote_count") { @@ -456,6 +461,7 @@ // Winner was broadcasted if (message.type == "poll_winner") { + winnerSelected = true; _emitEvent({type: "poll_winner", winner: message.winner, rounds: message.rounds, votesCounted: message.votesCounted}); } diff --git a/applications/voting/vote.qml b/applications/voting/vote.qml index bee2e85..5ed9ba4 100644 --- a/applications/voting/vote.qml +++ b/applications/voting/vote.qml @@ -95,7 +95,7 @@ Rectangle { TextField { width: 300 height: 30 - text: "New Poll" + text: MyAvatar.displayName + "'s Poll" cursorVisible: false font.pointSize: 16 Layout.fillWidth: true @@ -124,6 +124,7 @@ Rectangle { } + // Options RowLayout { width: parent.width @@ -135,6 +136,7 @@ Rectangle { } CheckBox { + id: poll_to_create_host_can_vote width: 30 height: 25 checked: false @@ -182,6 +184,7 @@ Rectangle { anchors.fill: parent onClicked: { toScript({type: "create_poll", poll: {title: poll_to_create_title.text, description: poll_to_create_description.text}}); + _clearHostCreate(); } } } @@ -906,6 +909,11 @@ Rectangle { poll_option_model_host.clear(); } + function _clearHostCreate() { + poll_to_create_title.text = MyAvatar.displayName + "'s Poll"; + poll_to_create_description.text = "Vote on things!"; + } + // Messages from script function fromScript(message) { switch (message.type){ @@ -963,6 +971,7 @@ Rectangle { // Set variables is_host = false + poll_to_create_host_can_vote.checked = false; break; From 9363457528392d99ae061313a0909e648d7eb9c9 Mon Sep 17 00:00:00 2001 From: armored-dragon Date: Fri, 13 Sep 2024 03:54:21 -0500 Subject: [PATCH 35/50] Fix page on closing and reopening window. --- applications/voting/vote.js | 13 +++++++- applications/voting/vote.qml | 59 ++++++++++++++++++++---------------- 2 files changed, 45 insertions(+), 27 deletions(-) diff --git a/applications/voting/vote.js b/applications/voting/vote.js index c1df777..12375db 100644 --- a/applications/voting/vote.js +++ b/applications/voting/vote.js @@ -16,6 +16,12 @@ // FIXME: Handle ties: Last two standing are tied. // FIXME: Host closes window does not return them to client view when applicable +// FIXME: Recasting vote from closed window does not populate the options. +// FIXME: Sound is inconsistent + +// STYLE --------------- +// FIXME: Camel case +// TODO: Placeholder text (() => { "use strict"; @@ -29,6 +35,7 @@ let electionIterations = 0; // How many times the election function has been called to narrow down a candidate. let activePolls = []; // All active polls. let winnerSelected = false; // Whether or not the election function has selected a winner for the active poll + let selectedPage = ""; // Selected page the vote screen is on. Used when the host closes the window. const url = Script.resolvePath("./vote.qml"); const myUuid = generateUUID(MyAvatar.sessionUUID); @@ -76,7 +83,8 @@ // If we are hosting a poll, switch the screen if (poll.id != '' && poll.host == myUuid) { - return _emitEvent({type: "rehost", prompt: {question: poll.question, options: poll.options}}); + // return _emitEvent({type: "rehost", prompt: {question: poll.question, options: poll.options}}); + return _emitEvent({type: "switch_page", page: selectedPage, options: {isHost: poll.host == myUuid, hostCanVote: poll.host_can_vote}, poll: poll}); } // Request a list of active polls if we are not already in one @@ -364,6 +372,9 @@ electionIterations = 0; preformElection(); break; + case "page_name": + selectedPage = event.page; + break; } } /** diff --git a/applications/voting/vote.qml b/applications/voting/vote.qml index 5ed9ba4..4f38848 100644 --- a/applications/voting/vote.qml +++ b/applications/voting/vote.qml @@ -45,7 +45,7 @@ Rectangle { anchors.fill: parent onClicked: { - current_page = "poll_create"; + _changePage("poll_create"); } } } @@ -164,7 +164,7 @@ Rectangle { MouseArea { anchors.fill: parent onClicked: { - current_page = "poll_list"; + _changePage("poll_list"); } } } @@ -217,10 +217,11 @@ Rectangle { verticalAlignment: Text.AlignVCenter y: 20 } + // TODO: Pleaseholder text TextEdit { id: poll_to_respond_title width: parent.width - text: "" + text: "" color: "white" font.pointSize: 20 wrapMode: Text.NoWrap @@ -236,6 +237,7 @@ Rectangle { Layout.fillWidth: true Layout.fillHeight: true + // TODO: Pleaseholder text ListView { property int index_selected: -1 width: parent.width - 40 @@ -345,8 +347,8 @@ Rectangle { toScript({type: "prompt", prompt: {question: poll_to_respond_title.text, options: options}, host_can_vote: host_can_vote}); // If the host can vote, change the screen to the client view to allow the vote - if (host_can_vote) current_page = "poll_client_view"; - else current_page = "poll_results" + if (host_can_vote) _changePage("poll_client_view"); + else _changePage("poll_results"); } } } @@ -482,7 +484,7 @@ Rectangle { toScript({type: "cast_vote", ballot: onlyNames}); // Change screen to results screen - current_page = "poll_results" + _changePage("poll_results"); } } } @@ -615,7 +617,7 @@ Rectangle { MouseArea { anchors.fill: parent onClicked: { - current_page = "poll_client_view" + _changePage("poll_client_view"); } } } @@ -667,7 +669,7 @@ Rectangle { MouseArea { anchors.fill: parent onClicked: { - current_page = "poll_host_view" + _changePage("poll_host_view"); } } } @@ -691,7 +693,7 @@ Rectangle { onClicked: { _clearHost(); _clearResults(); - current_page = "poll_host_view"; + _changePage("poll_host_view"); votes_tallied = false; } } @@ -914,6 +916,11 @@ Rectangle { poll_to_create_description.text = "Vote on things!"; } + function _changePage(pageName){ + current_page = pageName; + toScript({type: "page_name", page: pageName}); + } + // Messages from script function fromScript(message) { switch (message.type){ @@ -922,7 +929,7 @@ Rectangle { _clearHost() // Show host page - current_page = "poll_host_view"; + _changePage("poll_host_view"); // Set variables is_host = true @@ -949,7 +956,7 @@ Rectangle { if (is_host) return; - current_page = "poll_client_view"; + _changePage("poll_client_view"); // Clear the results page _clearResults() @@ -959,7 +966,7 @@ Rectangle { // Close the poll and remove it from the list of active polls case "close_poll": - if (message.change_page == true) current_page = "poll_list" + if (message.change_page == true) _changePage("poll_list"); // Find the poll with the matching ID and remove it from active polls for (var i = 0; i < active_polls.count; i++) { @@ -974,20 +981,6 @@ Rectangle { poll_to_create_host_can_vote.checked = false; break; - - // Open the host view - // Only called when the host closes their tablet and reopens it. - case "rehost": - current_page = "poll_host_view" - - poll_to_respond_title.text = message.prompt.question - - poll_option_model_host.clear(); - for (var option of message.prompt.options){ - console.log("adding option "+ option); - poll_option_model_host.append({option: option}) - } - break; case "poll_winner": poll_winner.text = message.winner tally_votes_itterations.text = message.rounds @@ -997,6 +990,20 @@ Rectangle { case "received_vote": tally_votes_received.text = message.voteCount break; + case "switch_page": + current_page = message.page; + is_host = message.options.isHost; + host_can_vote = message.options.hostCanVote; + // if (message.page == "poll_host_view") { + // poll_to_respond_title.text = message.poll.question + + // poll_option_model_host.clear(); + // for (var option of message.poll.options){ + // console.log("adding option "+ option); + // poll_option_model_host.append({option: option}) + // } + // } + break; } } From fb2f9a5400620053f72ca7bb6ddd0f66650ae9a3 Mon Sep 17 00:00:00 2001 From: armored-dragon Date: Fri, 13 Sep 2024 05:31:44 -0500 Subject: [PATCH 36/50] Simplified data storage. --- applications/voting/vote.js | 79 +++++++++++++++++++----------------- applications/voting/vote.qml | 73 +++++++++++++++++++++------------ 2 files changed, 87 insertions(+), 65 deletions(-) diff --git a/applications/voting/vote.js b/applications/voting/vote.js index 12375db..8be0b43 100644 --- a/applications/voting/vote.js +++ b/applications/voting/vote.js @@ -18,6 +18,7 @@ // FIXME: Host closes window does not return them to client view when applicable // FIXME: Recasting vote from closed window does not populate the options. // FIXME: Sound is inconsistent +// FIXME: Simplify // STYLE --------------- // FIXME: Camel case @@ -30,11 +31,9 @@ let active = false; const debug = false; - let poll = {id: '', title: '', description: '', host: '', question: '', options: [], host_can_vote: false}; // The current poll - let responses = {}; // All ballots received and to be used by the election function. - let electionIterations = 0; // How many times the election function has been called to narrow down a candidate. + let poll = {id: '', title: '', description: '', host: '', question: '', options: [], canHostVote: false}; // The current poll + let pollStats = {iterations: 0, responses: {}, winnerSelected: false, winnerName: "", votesReceived: 0, votesCounted: 0 }; let activePolls = []; // All active polls. - let winnerSelected = false; // Whether or not the election function has selected a winner for the active poll let selectedPage = ""; // Selected page the vote screen is on. Used when the host closes the window. const url = Script.resolvePath("./vote.qml"); @@ -83,8 +82,7 @@ // If we are hosting a poll, switch the screen if (poll.id != '' && poll.host == myUuid) { - // return _emitEvent({type: "rehost", prompt: {question: poll.question, options: poll.options}}); - return _emitEvent({type: "switch_page", page: selectedPage, options: {isHost: poll.host == myUuid, hostCanVote: poll.host_can_vote}, poll: poll}); + return _emitEvent({type: "switch_page", page: selectedPage, poll: poll, pollStats: pollStats}); } // Request a list of active polls if we are not already in one @@ -117,7 +115,7 @@ poll.title = pollInformation.title; poll.description = pollInformation.description; console.log(`Active poll set as:\nid:${poll.id}\ntitle:${poll.title}\ndescription:${poll.description}`); - responses = {}; // Clear any lingering responses + pollStats.responses = {}; // Clear any lingering responses // Send message to all clients Messages.sendMessage("ga-polls", JSON.stringify({type: "active_poll", poll: poll})); @@ -196,7 +194,7 @@ if (poll == undefined || poll.id == '') return; // Check if a winner was already chosen - if (winnerSelected) return; + if (pollStats.winnerSelected) return; // Send vote to users in poll Messages.sendMessage(poll.id, JSON.stringify({type: "vote", ballot: event.ballot, uuid: myUuid})); @@ -207,7 +205,7 @@ if (poll.host != myUuid) return; // We are not the host of this poll console.log(`Emitting prompt`); - Messages.sendMessage(poll.id, JSON.stringify({type: "poll_prompt", prompt: {question: poll.question, options: poll.options}})); + Messages.sendMessage(poll.id, JSON.stringify({type: "poll_prompt", poll: poll, pollStats: pollStats})); } // Take the gathered responses and preform the election @@ -218,12 +216,12 @@ let voteResults = {}; // Object that stores the total amount of votes each candidate gets // Don't run election if we don't have any votes. - if (Object.keys(responses).length == 0) return; + if (Object.keys(pollStats.responses).length == 0) return; // Go though each vote received and get the most preferred candidate per ballot. - Object.keys(responses).forEach((key) => { + Object.keys(pollStats.responses).forEach((key) => { let uuid = key; - let vote = responses[uuid]; + let vote = pollStats.responses[uuid]; // Assign first vote to new array firstVotes.push(vote[0]); @@ -243,7 +241,7 @@ voteResults[candidate]++ } - const totalVotes = Object.keys(responses).length; // Total votes to expect to be counted. + const totalVotes = Object.keys(pollStats.responses).length; // Total votes to expect to be counted. const majority = Math.floor(totalVotes / 2); // Minimum value to be considered a majority const sortedArray = Object.entries(voteResults).sort((a, b) => b[1] - a[1]); @@ -259,9 +257,15 @@ if (sortedObject[0][Object.keys(sortedObject[0])[0]] > majority) { let winnerName = Object.keys(sortedObject[0])[0]; if (winnerName == '-1') winnerName = "No vote"; - Messages.sendMessage(poll.id, JSON.stringify({type: "poll_winner", winner: winnerName, rounds: electionIterations, votesCounted: totalVotes})); - console.log(`\nWinner: ${winnerName}\nElection rounds: ${electionIterations}\nVotes counted: ${totalVotes}`); - responses = {}; + + pollStats.winnerName = winnerName; + pollStats.votesCounted = totalVotes; + + _emitEvent({type: "poll_sync", poll: poll, pollStats: pollStats}); + + Messages.sendMessage(poll.id, JSON.stringify({type: "poll_winner", pollStats: pollStats})); + console.log(`\nWinner: ${winnerName}\nElection rounds: ${pollStats.iterations}\nVotes counted: ${totalVotes}`); + pollStats.responses = {}; return; // Winner was selected. We are done! }; @@ -278,14 +282,14 @@ console.log(`Removing least popular: ${leastPopular}`); // Go into each vote and delete the selected least popular candidate - Object.keys(responses).forEach((uuid) => { + Object.keys(pollStats.responses).forEach((uuid) => { // Remove the least popular candidate from each vote. - if (responses[uuid].indexOf(leastPopular) != -1) responses[uuid].splice(responses[uuid].indexOf(leastPopular), 1); - console.log(responses[uuid]); + if (pollStats.responses[uuid].indexOf(leastPopular) != -1) pollStats.responses[uuid].splice(pollStats.responses[uuid].indexOf(leastPopular), 1); + console.log(pollStats.responses[uuid]); }); // Update statistics - electionIterations++; + pollStats.iterations++; // Run again preformElection(); @@ -306,7 +310,7 @@ const indexToRemove = Math.floor(Math.random() * ballot.length); ballot.splice(indexToRemove, ballot.length - indexToRemove); - const responsesKeyName = Object.keys(responses).length.toString(); + const responsesKeyName = Object.keys(pollStats.responses).length.toString(); responses[responsesKeyName] = ballot; function getRandomOrder(...words) { @@ -323,9 +327,9 @@ function _resetNetworking(){ if (poll.id) Messages.unsubscribe(poll.id); - poll = {id: '', title: '', description: '', host: '', question: '', options: [], host_can_vote: false}; - responses = {}; - electionIterations = 0; + poll = {id: '', title: '', description: '', host: '', question: '', options: [], canHostVote: false}; + pollStats.responses = {}; + pollStats.iterations = 0; activePolls = []; } @@ -340,7 +344,7 @@ // Communication function fromQML(event) { - console.log(`New QML event:\n${JSON.stringify(event)}`); + console.log(`New QML event:\n${JSON.stringify(event, null, 4)}`); switch (event.type) { case "create_poll": @@ -358,7 +362,7 @@ case "prompt": poll.question = event.prompt.question; poll.options = event.prompt.options; - poll.host_can_vote = event.host_can_vote + poll.canHostVote = event.canHostVote emitPrompt(); break; case "run_election": @@ -369,7 +373,7 @@ } } - electionIterations = 0; + pollStats.iterations = 0; preformElection(); break; case "page_name": @@ -390,8 +394,6 @@ // Not for us, ignore! if (channel !== 'ga-polls' && channel !== poll.id) return; - console.log(`Received message on ${channel} from server:\n${JSON.stringify(message)}\n`); - message = JSON.parse(message); switch (channel) { @@ -435,24 +437,24 @@ // Received poll information if (message.type == "poll_prompt") { - console.log(`Prompt:\n ${JSON.stringify(message.prompt)}`); + console.log(`Prompt:\n ${JSON.stringify(message.poll)}`); // TODO: This is still silly. Try using UUIDs per prompt and check if we are answering the same question by id? // Don't recreate the prompt if we already have the matching question - if (message.prompt.question == poll.question && !poll.host_can_vote) return; + if (message.poll.question == poll.question && !poll.canHostVote) return; // Play sound for new poll _emitSound("new_prompt"); - _emitEvent({type: "poll_prompt", prompt: message.prompt}); + _emitEvent({type: "poll_prompt", poll: message.poll}); - poll.question = message.prompt.question; + poll.question = message.poll.question; - winnerSelected = false; + pollStats.winnerSelected = false; } if (message.type == "vote_count") { - _emitEvent({type: "received_vote", voteCount: message.voteCount}); + _emitEvent({type: "received_vote", pollStats: pollStats}); } // Received a ballot @@ -461,18 +463,19 @@ if (poll.host != myUuid) return; // Record the ballot - responses[message.uuid] = message.ballot; + pollStats.responses[message.uuid] = message.ballot; // Emit a echo so the voter knows we have received it // TODO: // Broadcast the updated count to all clients - Messages.sendMessage(poll.id, JSON.stringify({type: "vote_count", voteCount: Object.keys(responses).length})); + pollStats.votesReceived = Object.keys(pollStats.responses).length; + Messages.sendMessage(poll.id, JSON.stringify({type: "vote_count", pollStats: pollStats})); } // Winner was broadcasted if (message.type == "poll_winner") { - winnerSelected = true; + pollStats.winnerSelected = true; _emitEvent({type: "poll_winner", winner: message.winner, rounds: message.rounds, votesCounted: message.votesCounted}); } diff --git a/applications/voting/vote.qml b/applications/voting/vote.qml index 4f38848..6d1e4e7 100644 --- a/applications/voting/vote.qml +++ b/applications/voting/vote.qml @@ -10,10 +10,10 @@ Rectangle { height: 700 id: root - // property string current_page: "poll_results" - property string current_page: "poll_list" - property bool host_can_vote: false + property var poll: {} + property var pollStats: {} + property bool canHostVote: false property bool is_host: false property bool votes_tallied: false @@ -141,7 +141,7 @@ Rectangle { height: 25 checked: false onToggled: { - host_can_vote = checked + canHostVote = checked } } } @@ -344,10 +344,10 @@ Rectangle { } // Send the prompt to the server - toScript({type: "prompt", prompt: {question: poll_to_respond_title.text, options: options}, host_can_vote: host_can_vote}); + toScript({type: "prompt", prompt: {question: poll_to_respond_title.text, options: options}, canHostVote: canHostVote}); // If the host can vote, change the screen to the client view to allow the vote - if (host_can_vote) _changePage("poll_client_view"); + if (canHostVote) _changePage("poll_client_view"); else _changePage("poll_results"); } } @@ -605,7 +605,7 @@ Rectangle { width: 150 height: 40 color: "#c0bfbc" - visible: ((is_host && host_can_vote) || !is_host) + visible: ((is_host && canHostVote) || !is_host) Text { anchors.centerIn: parent @@ -921,6 +921,23 @@ Rectangle { toScript({type: "page_name", page: pageName}); } + function _populateHostCreate(){ + + } + function _populateClient() { + prompt_question.text = poll.question; + for (var option of poll.options){ + console.log("adding option "+ option); + poll_option_model.append({option: option, rank: 0}) + } + } + function _populateResults(){ + tally_votes_received.text = pollStats.votesReceived; + poll_winner.text = pollStats.winnerName; + tally_votes_itterations.text = pollStats.iterations; + tally_votes_counted.text = pollStats.votesCounted; + } + // Messages from script function fromScript(message) { switch (message.type){ @@ -947,12 +964,14 @@ Rectangle { // Clear options poll_option_model.clear(); + poll = message.poll; + pollStats = message.pollStats; + + console.log("\n\n\n\n") + console.log(JSON.stringify(poll, null, 4)) + // Set values - prompt_question.text = message.prompt.question - for (var option of message.prompt.options){ - console.log("adding option "+ option); - poll_option_model.append({option: option, rank: 0}) - } + _populateClient() if (is_host) return; @@ -982,27 +1001,27 @@ Rectangle { break; case "poll_winner": - poll_winner.text = message.winner - tally_votes_itterations.text = message.rounds - tally_votes_counted.text = message.votesCounted - votes_tallied = true + _populateResults(); + votes_tallied = true; break; case "received_vote": - tally_votes_received.text = message.voteCount + pollStats.votesReceived = message.pollStats.votesReceived; + _populateResults(); break; case "switch_page": current_page = message.page; - is_host = message.options.isHost; - host_can_vote = message.options.hostCanVote; - // if (message.page == "poll_host_view") { - // poll_to_respond_title.text = message.poll.question + poll = message.poll; + pollStats = message.pollStats; - // poll_option_model_host.clear(); - // for (var option of message.poll.options){ - // console.log("adding option "+ option); - // poll_option_model_host.append({option: option}) - // } - // } + if (message.page == "poll_client_view") _populateClient(); + if (message.page == "poll_results") { + _populateClient(); + _populateResults(); + }; + break; + case "poll_sync": + poll = message.poll; + pollStats = message.pollStats; break; } } From c2e4eacb92762af128449ed62ab6ae803ad36859 Mon Sep 17 00:00:00 2001 From: armored-dragon Date: Fri, 13 Sep 2024 05:37:17 -0500 Subject: [PATCH 37/50] Fixed results page not updating sometimes. --- applications/voting/vote.qml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/applications/voting/vote.qml b/applications/voting/vote.qml index 6d1e4e7..9fb053e 100644 --- a/applications/voting/vote.qml +++ b/applications/voting/vote.qml @@ -933,7 +933,7 @@ Rectangle { } function _populateResults(){ tally_votes_received.text = pollStats.votesReceived; - poll_winner.text = pollStats.winnerName; + poll_winner.text = pollStats.winnerName ? pollStats.winnerName : "---"; tally_votes_itterations.text = pollStats.iterations; tally_votes_counted.text = pollStats.votesCounted; } @@ -967,9 +967,6 @@ Rectangle { poll = message.poll; pollStats = message.pollStats; - console.log("\n\n\n\n") - console.log(JSON.stringify(poll, null, 4)) - // Set values _populateClient() @@ -1005,7 +1002,7 @@ Rectangle { votes_tallied = true; break; case "received_vote": - pollStats.votesReceived = message.pollStats.votesReceived; + pollStats = message.pollStats; _populateResults(); break; case "switch_page": From f6985faf5967a69398d97966e0f90cfb4fa693cd Mon Sep 17 00:00:00 2001 From: armored-dragon Date: Fri, 13 Sep 2024 05:44:57 -0500 Subject: [PATCH 38/50] Fixed some syncing issues. --- applications/voting/vote.js | 8 ++++---- applications/voting/vote.qml | 2 ++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/applications/voting/vote.js b/applications/voting/vote.js index 8be0b43..575f417 100644 --- a/applications/voting/vote.js +++ b/applications/voting/vote.js @@ -80,10 +80,10 @@ // If we are connected to a poll already, repopulate the screen if (poll.id != '' && poll.host != myUuid) return joinPoll({id: poll.id}); - // If we are hosting a poll, switch the screen - if (poll.id != '' && poll.host == myUuid) { - return _emitEvent({type: "switch_page", page: selectedPage, poll: poll, pollStats: pollStats}); - } + // Sync + // TODO: switch_page optional sync components? + _emitEvent({type: "poll_sync", poll: poll, pollStats: pollStats, isHost: poll.host == myUuid}); + if (selectedPage) _emitEvent({type: "switch_page", page: selectedPage, poll: poll, pollStats: pollStats}); // Request a list of active polls if we are not already in one if (poll.id == '') return getActivePolls(); diff --git a/applications/voting/vote.qml b/applications/voting/vote.qml index 9fb053e..78aa436 100644 --- a/applications/voting/vote.qml +++ b/applications/voting/vote.qml @@ -1019,6 +1019,8 @@ Rectangle { case "poll_sync": poll = message.poll; pollStats = message.pollStats; + is_host = message.isHost; + canHostVote = message.poll.canHostVote; break; } } From 5b4b9f2bdcd855211d13beda0829268ac3dc3264 Mon Sep 17 00:00:00 2001 From: armored-dragon Date: Fri, 13 Sep 2024 16:50:07 -0500 Subject: [PATCH 39/50] Fixed results population. Fixed alignment. --- applications/voting/vote.js | 7 ++++--- applications/voting/vote.qml | 23 ++++++++++++----------- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/applications/voting/vote.js b/applications/voting/vote.js index 575f417..1809db5 100644 --- a/applications/voting/vote.js +++ b/applications/voting/vote.js @@ -19,6 +19,7 @@ // FIXME: Recasting vote from closed window does not populate the options. // FIXME: Sound is inconsistent // FIXME: Simplify +// FIXME: The results screen is not being cleared properly? // STYLE --------------- // FIXME: Camel case @@ -260,6 +261,7 @@ pollStats.winnerName = winnerName; pollStats.votesCounted = totalVotes; + pollStats.winnerSelected = true; _emitEvent({type: "poll_sync", poll: poll, pollStats: pollStats}); @@ -454,7 +456,7 @@ } if (message.type == "vote_count") { - _emitEvent({type: "received_vote", pollStats: pollStats}); + _emitEvent({type: "received_vote", pollStats: message.pollStats}); } // Received a ballot @@ -475,8 +477,7 @@ // Winner was broadcasted if (message.type == "poll_winner") { - pollStats.winnerSelected = true; - _emitEvent({type: "poll_winner", winner: message.winner, rounds: message.rounds, votesCounted: message.votesCounted}); + _emitEvent({type: "poll_winner", pollStats: message.pollStats}); } } diff --git a/applications/voting/vote.qml b/applications/voting/vote.qml index 78aa436..2efb309 100644 --- a/applications/voting/vote.qml +++ b/applications/voting/vote.qml @@ -269,13 +269,13 @@ Rectangle { // Host actions ColumnLayout { - anchors.horizontalCenter: parent.horizontalCenter + Layout.alignment: Qt.AlignHCenter width: parent.width height: 40 RowLayout { width: parent.width - anchors.horizontalCenter: parent.horizontalCenter + Layout.alignment: Qt.AlignHCenter // Close poll Rectangle { @@ -401,6 +401,7 @@ Rectangle { width: parent.width Layout.fillWidth: true Layout.fillHeight: true + Layout.alignment: Qt.AlignHCenter ListView { property int index_selected: -1 @@ -597,7 +598,7 @@ Rectangle { // Client actions RowLayout { width: parent.width - anchors.horizontalCenter: parent.horizontalCenter + Layout.alignment: Qt.AlignHCenter visible: !votes_tallied // Recast vote @@ -627,7 +628,7 @@ Rectangle { RowLayout { visible: is_host width: parent.width - anchors.horizontalCenter: parent.horizontalCenter + Layout.alignment: Qt.AlignHCenter // Preform Election Rectangle { @@ -726,7 +727,7 @@ Rectangle { Item { width: parent.width - 10 - anchors.horizontalCenter: parent.horizontalCenter + Layout.alignment: Qt.AlignHCenter height: parent.height clip: true @@ -815,7 +816,6 @@ Rectangle { Row { width: parent.width - 10 - anchors.horizontalCenter: parent.horizontalCenter height: parent.height clip: true @@ -840,7 +840,7 @@ Rectangle { Text { Layout.fillWidth: true text: option - anchors.centerIn: parent + anchors.centerIn: parent // FIXME: QML Does not like this for some reason... color: "white" font.pointSize: 14 } @@ -867,7 +867,7 @@ Rectangle { RowLayout { width: parent.width - anchors.horizontalCenter: parent.horizontalCenter + Layout.alignment: Qt.AlignHCenter height: parent.height TextField { @@ -933,9 +933,9 @@ Rectangle { } function _populateResults(){ tally_votes_received.text = pollStats.votesReceived; - poll_winner.text = pollStats.winnerName ? pollStats.winnerName : "---"; - tally_votes_itterations.text = pollStats.iterations; - tally_votes_counted.text = pollStats.votesCounted; + poll_winner.text = pollStats.winnerSelected ? pollStats.winnerName : "---"; + tally_votes_itterations.text = pollStats.winnerSelected ? pollStats.iterations : "-"; + tally_votes_counted.text = pollStats.winnerSelected ? pollStats.votesCounted : "-"; } // Messages from script @@ -998,6 +998,7 @@ Rectangle { break; case "poll_winner": + pollStats = message.pollStats; _populateResults(); votes_tallied = true; break; From 46b95e6f937dfdd0ca0d397aad06a85814ca4bd0 Mon Sep 17 00:00:00 2001 From: armored-dragon Date: Fri, 13 Sep 2024 17:19:43 -0500 Subject: [PATCH 40/50] Removed redundant function. Improved results screen. --- applications/voting/vote.js | 4 ++-- applications/voting/vote.qml | 10 +--------- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/applications/voting/vote.js b/applications/voting/vote.js index 1809db5..9d9bd25 100644 --- a/applications/voting/vote.js +++ b/applications/voting/vote.js @@ -445,14 +445,14 @@ // Don't recreate the prompt if we already have the matching question if (message.poll.question == poll.question && !poll.canHostVote) return; + pollStats = {iterations: 0, responses: {}, winnerSelected: false, winnerName: "", votesReceived: 0, votesCounted: 0 } + poll = message.poll; // Play sound for new poll _emitSound("new_prompt"); _emitEvent({type: "poll_prompt", poll: message.poll}); poll.question = message.poll.question; - - pollStats.winnerSelected = false; } if (message.type == "vote_count") { diff --git a/applications/voting/vote.qml b/applications/voting/vote.qml index 2efb309..ba6c38a 100644 --- a/applications/voting/vote.qml +++ b/applications/voting/vote.qml @@ -693,7 +693,6 @@ Rectangle { anchors.fill: parent onClicked: { _clearHost(); - _clearResults(); _changePage("poll_host_view"); votes_tallied = false; } @@ -899,13 +898,6 @@ Rectangle { } } - function _clearResults(){ - poll_winner.text = "---" - tally_votes_itterations.text = "-" - tally_votes_counted.text = "-" - tally_votes_received.text = "0" - } - function _clearHost(){ poll_to_respond_title.text = "" poll_option_model_host.clear(); @@ -975,7 +967,7 @@ Rectangle { _changePage("poll_client_view"); // Clear the results page - _clearResults() + _populateResults(); // Set the options break; From 92cfd39e5d4a6f2a2027f02f899d9a7486bc83ce Mon Sep 17 00:00:00 2001 From: armored-dragon Date: Fri, 13 Sep 2024 17:30:22 -0500 Subject: [PATCH 41/50] Don't clear client screen on new poll join. --- applications/voting/vote.js | 2 +- applications/voting/vote.qml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/applications/voting/vote.js b/applications/voting/vote.js index 9d9bd25..b6a2379 100644 --- a/applications/voting/vote.js +++ b/applications/voting/vote.js @@ -447,7 +447,7 @@ pollStats = {iterations: 0, responses: {}, winnerSelected: false, winnerName: "", votesReceived: 0, votesCounted: 0 } poll = message.poll; - // Play sound for new poll + _emitSound("new_prompt"); _emitEvent({type: "poll_prompt", poll: message.poll}); diff --git a/applications/voting/vote.qml b/applications/voting/vote.qml index ba6c38a..2da09e3 100644 --- a/applications/voting/vote.qml +++ b/applications/voting/vote.qml @@ -953,6 +953,7 @@ Rectangle { // Populate the client view of the current question and options case "poll_prompt": active_polls_list.index_selected = -1; // Unselect whatever poll was selected (If one was selected) + if (poll.question == message.poll.question) return; // Clear options poll_option_model.clear(); From d4a2dbed186cb0d6e470741a95cebe9947b9e3ea Mon Sep 17 00:00:00 2001 From: armored-dragon Date: Sat, 14 Sep 2024 06:24:35 -0500 Subject: [PATCH 42/50] Networking improvements. --- applications/voting/vote.js | 42 ++++++++++++++++++++---------------- applications/voting/vote.qml | 4 ++-- 2 files changed, 25 insertions(+), 21 deletions(-) diff --git a/applications/voting/vote.js b/applications/voting/vote.js index b6a2379..6747382 100644 --- a/applications/voting/vote.js +++ b/applications/voting/vote.js @@ -33,7 +33,7 @@ const debug = false; let poll = {id: '', title: '', description: '', host: '', question: '', options: [], canHostVote: false}; // The current poll - let pollStats = {iterations: 0, responses: {}, winnerSelected: false, winnerName: "", votesReceived: 0, votesCounted: 0 }; + let pollStats = {iterations: 0, responses: {}, winnerSelected: false, winnerName: "", votesReceived: 0, votesCounted: 0 }; // Sent by host let activePolls = []; // All active polls. let selectedPage = ""; // Selected page the vote screen is on. Used when the host closes the window. @@ -173,6 +173,7 @@ // Log the successful join console.log(`Successfully joined ${poll.id}`); + _emitEvent({type: "switch_page", page: "poll_client_view"}); } // Leave a poll hosted by another user @@ -201,11 +202,11 @@ Messages.sendMessage(poll.id, JSON.stringify({type: "vote", ballot: event.ballot, uuid: myUuid})); } - // Emit the prompt question and options to the server + // Emit the prompt question and options to the clients function emitPrompt(){ if (poll.host != myUuid) return; // We are not the host of this poll - console.log(`Emitting prompt`); + console.log(`Host: Emitting prompt: ${JSON.stringify({type: "poll_prompt", poll: poll, pollStats: pollStats})}`); Messages.sendMessage(poll.id, JSON.stringify({type: "poll_prompt", poll: poll, pollStats: pollStats})); } @@ -365,6 +366,7 @@ poll.question = event.prompt.question; poll.options = event.prompt.options; poll.canHostVote = event.canHostVote + pollStats = {iterations: 0, responses: {}, winnerSelected: false, winnerName: "", votesReceived: 0, votesCounted: 0 }; emitPrompt(); break; case "run_election": @@ -432,33 +434,36 @@ break; case poll.id: - // Received poll request - if (message.type == "join") { - emitPrompt(); - } - // Received poll information if (message.type == "poll_prompt") { - console.log(`Prompt:\n ${JSON.stringify(message.poll)}`); + console.log(`Received new prompt from host:\n${JSON.stringify(message.poll, null, 4)}`); // TODO: This is still silly. Try using UUIDs per prompt and check if we are answering the same question by id? // Don't recreate the prompt if we already have the matching question - if (message.poll.question == poll.question && !poll.canHostVote) return; + if (message.poll.question == poll.question && poll.host != myUuid) return; + if (poll.host == myUuid && !poll.canHostVote) return; - pollStats = {iterations: 0, responses: {}, winnerSelected: false, winnerName: "", votesReceived: 0, votesCounted: 0 } + // update our poll information poll = message.poll; + _emitSound("new_prompt"); - _emitEvent({type: "poll_prompt", poll: message.poll}); - - poll.question = message.poll.question; + _emitEvent({type: "poll_prompt", poll: poll, pollStats: pollStats}); } if (message.type == "vote_count") { _emitEvent({type: "received_vote", pollStats: message.pollStats}); } + // Winner was broadcasted + if (message.type == "poll_winner") { + _emitEvent({type: "poll_winner", pollStats: message.pollStats}); + } + + // Host only ----- + if (poll.host != myUuid) return; + // Received a ballot if (message.type == "vote") { // Check if we are the host @@ -475,12 +480,11 @@ Messages.sendMessage(poll.id, JSON.stringify({type: "vote_count", pollStats: pollStats})); } - // Winner was broadcasted - if (message.type == "poll_winner") { - _emitEvent({type: "poll_winner", pollStats: message.pollStats}); + // Received poll request + if (message.type == "join") { + emitPrompt(); } - - } + } } })(); \ No newline at end of file diff --git a/applications/voting/vote.qml b/applications/voting/vote.qml index 2da09e3..b71ec37 100644 --- a/applications/voting/vote.qml +++ b/applications/voting/vote.qml @@ -1001,8 +1001,8 @@ Rectangle { break; case "switch_page": current_page = message.page; - poll = message.poll; - pollStats = message.pollStats; + if (message.poll) poll = message.poll; + if (message.pollStats) pollStats = message.pollStats; if (message.page == "poll_client_view") _populateClient(); if (message.page == "poll_results") { From 6f1aaddfb57d66fabfb15d64b459a56997c9a89f Mon Sep 17 00:00:00 2001 From: armored-dragon Date: Mon, 16 Sep 2024 09:54:27 -0500 Subject: [PATCH 43/50] Networking improvements. --- applications/voting/vote.js | 65 +++++++++++++++++++++++++++--------- applications/voting/vote.qml | 30 ++++++++++------- 2 files changed, 68 insertions(+), 27 deletions(-) diff --git a/applications/voting/vote.js b/applications/voting/vote.js index 6747382..9730716 100644 --- a/applications/voting/vote.js +++ b/applications/voting/vote.js @@ -34,6 +34,7 @@ let poll = {id: '', title: '', description: '', host: '', question: '', options: [], canHostVote: false}; // The current poll let pollStats = {iterations: 0, responses: {}, winnerSelected: false, winnerName: "", votesReceived: 0, votesCounted: 0 }; // Sent by host + let pollClientState = {hasVoted: false, isHost: false}; let activePolls = []; // All active polls. let selectedPage = ""; // Selected page the vote screen is on. Used when the host closes the window. @@ -78,16 +79,12 @@ if (url == newUrl) { active = true; - // If we are connected to a poll already, repopulate the screen - if (poll.id != '' && poll.host != myUuid) return joinPoll({id: poll.id}); - - // Sync - // TODO: switch_page optional sync components? - _emitEvent({type: "poll_sync", poll: poll, pollStats: pollStats, isHost: poll.host == myUuid}); - if (selectedPage) _emitEvent({type: "switch_page", page: selectedPage, poll: poll, pollStats: pollStats}); + if (poll.id != '') { + return _findWhereWeNeedToBe() + } // Request a list of active polls if we are not already in one - if (poll.id == '') return getActivePolls(); + return getActivePolls(); } else active = false; @@ -96,6 +93,22 @@ }); } + function _findWhereWeNeedToBe(){ + // Vote has been completed + if (pollStats.winnerSelected) return _emitEvent({type: "switch_page", page: 'poll_results', poll: poll, pollStats: pollStats, isHost: pollClientState.isHost}); + + // Has voted already + if (pollClientState.hasVoted) return _emitEvent({type: "switch_page", page: 'poll_results', poll: poll, pollStats: pollStats, isHost: pollClientState.isHost}); + + // Has not voted yet, is not the host + if (!pollClientState.hasVoted && !pollClientState.isHost) return _emitEvent({type: "switch_page", page: 'poll_client_view', poll: poll, pollStats: pollStats, isHost: pollClientState.isHost}); + + // Has not voted yet, is the host + if (!pollClientState.hasVoted && (pollClientState.isHost && poll.canHostVote)) return _emitEvent({type: "switch_page", page: 'poll_client_view', poll: poll, pollStats: pollStats, isHost: pollClientState.isHost}); + + _emitEvent({type: "switch_page", page: selectedPage, poll: poll, pollStats: pollStats, isHost: pollClientState.isHost}); + } + // Functions // Get a list of active polls @@ -118,6 +131,9 @@ console.log(`Active poll set as:\nid:${poll.id}\ntitle:${poll.title}\ndescription:${poll.description}`); pollStats.responses = {}; // Clear any lingering responses + // Update Client State + pollClientState.isHost = true; + // Send message to all clients Messages.sendMessage("ga-polls", JSON.stringify({type: "active_poll", poll: poll})); console.log("Broadcasted poll to server"); @@ -200,14 +216,15 @@ // Send vote to users in poll Messages.sendMessage(poll.id, JSON.stringify({type: "vote", ballot: event.ballot, uuid: myUuid})); + pollClientState.hasVoted = true; } // Emit the prompt question and options to the clients function emitPrompt(){ - if (poll.host != myUuid) return; // We are not the host of this poll + if (!pollClientState.isHost) return; // We are not the host of this poll - console.log(`Host: Emitting prompt: ${JSON.stringify({type: "poll_prompt", poll: poll, pollStats: pollStats})}`); - Messages.sendMessage(poll.id, JSON.stringify({type: "poll_prompt", poll: poll, pollStats: pollStats})); + console.log(`Host: Emitting prompt: ${JSON.stringify({type: "poll_prompt", poll: poll, pollStats: pollStats}, null, 4)}`); + Messages.sendMessage(poll.id, JSON.stringify({type: "poll_prompt", poll: poll, pollStats: pollStats}, null, 4)); } // Take the gathered responses and preform the election @@ -264,7 +281,7 @@ pollStats.votesCounted = totalVotes; pollStats.winnerSelected = true; - _emitEvent({type: "poll_sync", poll: poll, pollStats: pollStats}); + // _emitEvent({type: "poll_sync", poll: poll, pollStats: pollStats}); Messages.sendMessage(poll.id, JSON.stringify({type: "poll_winner", pollStats: pollStats})); console.log(`\nWinner: ${winnerName}\nElection rounds: ${pollStats.iterations}\nVotes counted: ${totalVotes}`); @@ -334,6 +351,7 @@ pollStats.responses = {}; pollStats.iterations = 0; activePolls = []; + pollClientState = {isHost: false, hasVoted: false}; } function _emitSound(type){ @@ -440,12 +458,13 @@ // TODO: This is still silly. Try using UUIDs per prompt and check if we are answering the same question by id? // Don't recreate the prompt if we already have the matching question - if (message.poll.question == poll.question && poll.host != myUuid) return; - if (poll.host == myUuid && !poll.canHostVote) return; + if (message.poll.question == poll.question && !pollClientState.isHost) return; + if (pollClientState.isHost && !poll.canHostVote) return; // update our poll information poll = message.poll; - + pollClientState.hasVoted = false; + pollStats.winnerSelected = false; _emitSound("new_prompt"); @@ -458,9 +477,20 @@ // Winner was broadcasted if (message.type == "poll_winner") { + pollStats = message.pollStats; _emitEvent({type: "poll_winner", pollStats: message.pollStats}); } + // Received a sync packet + if (message.type == "sync"){ + if (pollClientState.isHost) return; // Host doesn't need to sync to itself + + console.log("Got sync packet!"); + poll = message.poll; + pollStats = message.pollStats; + _findWhereWeNeedToBe(); + } + // Host only ----- if (poll.host != myUuid) return; @@ -482,6 +512,11 @@ // Received poll request if (message.type == "join") { + if (!pollClientState.isHost) return; + + // Send a sync packet + console.log("Sending sync packet."); + Messages.sendMessage(poll.id, JSON.stringify({type: "sync", poll: poll, pollStats: pollStats})); emitPrompt(); } } diff --git a/applications/voting/vote.qml b/applications/voting/vote.qml index b71ec37..9ac445b 100644 --- a/applications/voting/vote.qml +++ b/applications/voting/vote.qml @@ -12,7 +12,7 @@ Rectangle { property string current_page: "poll_list" property var poll: {} - property var pollStats: {} + property var pollStats: { winnerSelected: false } property bool canHostVote: false property bool is_host: false property bool votes_tallied: false @@ -345,7 +345,7 @@ Rectangle { // Send the prompt to the server toScript({type: "prompt", prompt: {question: poll_to_respond_title.text, options: options}, canHostVote: canHostVote}); - + // If the host can vote, change the screen to the client view to allow the vote if (canHostVote) _changePage("poll_client_view"); else _changePage("poll_results"); @@ -606,7 +606,7 @@ Rectangle { width: 150 height: 40 color: "#c0bfbc" - visible: ((is_host && canHostVote) || !is_host) + visible: ((is_host && canHostVote) || !is_host) && !pollStats.winnerSelected Text { anchors.centerIn: parent @@ -913,8 +913,12 @@ Rectangle { toScript({type: "page_name", page: pageName}); } - function _populateHostCreate(){ + function _populateHost(){ + poll_to_respond_title.text = poll.title; + for (var option of poll.options){ + poll_option_model_host.append({option: option}); + } } function _populateClient() { prompt_question.text = poll.question; @@ -953,7 +957,7 @@ Rectangle { // Populate the client view of the current question and options case "poll_prompt": active_polls_list.index_selected = -1; // Unselect whatever poll was selected (If one was selected) - if (poll.question == message.poll.question) return; + // Clear options poll_option_model.clear(); @@ -1003,18 +1007,20 @@ Rectangle { current_page = message.page; if (message.poll) poll = message.poll; if (message.pollStats) pollStats = message.pollStats; + if (message.isHost) is_host = true; - if (message.page == "poll_client_view") _populateClient(); + if (message.page == "poll_client_view") { + _populateClient(); + if (is_host) _populateHost(); + } if (message.page == "poll_results") { _populateClient(); _populateResults(); + if (is_host) _populateHost(); }; - break; - case "poll_sync": - poll = message.poll; - pollStats = message.pollStats; - is_host = message.isHost; - canHostVote = message.poll.canHostVote; + if (message.page == "poll_host_view"){ + if (is_host) _populateHost(); + } break; } } From 7801eb3b811cacfa5c13a5c5652ac93a784d8415 Mon Sep 17 00:00:00 2001 From: armored-dragon Date: Mon, 16 Sep 2024 12:07:34 -0500 Subject: [PATCH 44/50] Removed developer art for host. --- applications/voting/img/trash.png | Bin 0 -> 771 bytes applications/voting/vote.js | 2 + applications/voting/vote.qml | 84 +++++++++++++++++------------- 3 files changed, 51 insertions(+), 35 deletions(-) create mode 100644 applications/voting/img/trash.png diff --git a/applications/voting/img/trash.png b/applications/voting/img/trash.png new file mode 100644 index 0000000000000000000000000000000000000000..0d26b9c62fd0c9afd689e599b4ad0d0c44c90966 GIT binary patch literal 771 zcmeAS@N?(olHy`uVBq!ia0y~yU`PRB4mJh`hJr^^Ll_tsI14-?iy0W?4uLRZ-i1;- z1_lPn64!{5;QX|b^2DN4hVt@qz0ADq;^f4FRK5J7^x5xhq!<{OCV09yhE&XXdv|}9 zNT7`S$H@{~ghU)&RDLYqC@A`7OTdPYj3Qe^*VHn2ztyc}6y36EgYcF>0TEptokg8V zi#gaPsX4`TD?T{oBeCiGIk_*tUm6M5l|R@peJ)E{n%iQ*hlbW~xjPCul_o0~VIzt! z?`sg7-uSce+Ap3v@)>L6(pu_cYPjaeW~@y=u(R>nE7j;}KApO+4GQ)hn8W*<``oL| z*S0o&p2r}sE*X$?dKZVyjFJ=fkAyxHOk%vbDMiRd%`rvDW!aJKYeJ9hk37S~Ze91C z`@`k~vz%}7$-J=G&hqEi%so#<&k zO(#@35Jb;M`!;F6i+3*ndCR=vM)5Jl2Og(CrarhTwtlr%@r2t4UQT;#-Vkk@9>bWo zO{Si2&do=qp;L9e!49D*afY97hu`f8`G^oPgnk zWyfkyq@6F@&%7oiV)L@Ov*$!>?~PbHy{VS{+Z73&Pog)%t1{N=zAjw4Q>{OXXYE%` zORvvjEwZL<+-n$)H~24Qzy7Ob5BoZ%*HfSQUzR$1TEF{v!>;?A-Z6 Date: Mon, 16 Sep 2024 12:14:48 -0500 Subject: [PATCH 45/50] Don't allow empty options. --- applications/voting/vote.js | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/applications/voting/vote.js b/applications/voting/vote.js index 7598f30..8444a93 100644 --- a/applications/voting/vote.js +++ b/applications/voting/vote.js @@ -15,15 +15,8 @@ // FIXME: Handle ties: kill both of tied results // FIXME: Handle ties: Last two standing are tied. -// FIXME: Host closes window does not return them to client view when applicable -// FIXME: Recasting vote from closed window does not populate the options. -// FIXME: Sound is inconsistent -// FIXME: Simplify -// FIXME: The results screen is not being cleared properly? - // STYLE --------------- // FIXME: Camel case -// TODO: Placeholder text (() => { "use strict"; @@ -228,7 +221,6 @@ } // Take the gathered responses and preform the election - // TODO: Simplify logging of critical information // FIXME: Recursive function call function preformElection(){ let firstVotes = []; // List of first choices from every ballot @@ -384,7 +376,7 @@ break; case "prompt": poll.question = event.prompt.question; - poll.options = event.prompt.options; + poll.options = event.prompt.options.filter(String); // Clean empty options poll.canHostVote = event.canHostVote pollStats = {iterations: 0, responses: {}, winnerSelected: false, winnerName: "", votesReceived: 0, votesCounted: 0 }; emitPrompt(); From fa751c0667f14c2b0da5784bd4c5c3964548cf13 Mon Sep 17 00:00:00 2001 From: armored-dragon Date: Mon, 16 Sep 2024 12:33:37 -0500 Subject: [PATCH 46/50] Minor formatting adjustment. --- applications/voting/vote.js | 28 +++++++++++++------------- applications/voting/vote.qml | 38 ++++++++++++++++++------------------ 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a/applications/voting/vote.js b/applications/voting/vote.js index 8444a93..79e59dc 100644 --- a/applications/voting/vote.js +++ b/applications/voting/vote.js @@ -9,7 +9,7 @@ // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html -/* global Script Tablet Messages MyAvatar Uuid*/ +/* global Script Tablet Messages MyAvatar AvatarList Uuid SoundCache*/ // TODO: Documentation // FIXME: Handle ties: kill both of tied results @@ -73,7 +73,7 @@ active = true; if (poll.id != '') { - return _findWhereWeNeedToBe() + return _findWhereWeNeedToBe(); } // Request a list of active polls if we are not already in one @@ -148,7 +148,7 @@ // Confirm to user if they want to close the poll if (!bypassPrompt) { - var answer = Window.confirm('Are you sure you want to close the poll?') + var answer = Window.confirm('Are you sure you want to close the poll?'); if (!answer) return; } @@ -158,7 +158,7 @@ Messages.sendMessage("ga-polls", JSON.stringify({type: "close_poll", poll: {id: poll.id}})); // Update the UI screen - _emitEvent({type: "close_poll", poll: {id: poll.id}, change_page: true}); + _emitEvent({type: "close_poll", poll: {id: poll.id}, changePage: true}); // Clear our active poll data _resetNetworking(); @@ -249,7 +249,7 @@ if (!voteResults[candidate]) voteResults[candidate] = 0; // Increment value for each vote - voteResults[candidate]++ + voteResults[candidate]++; } const totalVotes = Object.keys(pollStats.responses).length; // Total votes to expect to be counted. @@ -323,7 +323,7 @@ ballot.splice(indexToRemove, ballot.length - indexToRemove); const responsesKeyName = Object.keys(pollStats.responses).length.toString(); - responses[responsesKeyName] = ballot; + pollStats.responses[responsesKeyName] = ballot; function getRandomOrder(...words) { for (let i = words.length - 1; i > 0; i--) { @@ -348,10 +348,11 @@ function _emitSound(type){ switch (type) { - case "new_prompt": - const newPollSound = SoundCache.getSound(Script.resolvePath("./sound/new_vote.mp3")) - Audio.playSystemSound(newPollSound, {volume: 0.5}); - break; + case "new_prompt": { + let newPollSound = SoundCache.getSound(Script.resolvePath("./sound/new_vote.mp3")); + Audio.playSystemSound(newPollSound, {volume: 0.5}); + break; + } } } @@ -377,7 +378,7 @@ case "prompt": poll.question = event.prompt.question; poll.options = event.prompt.options.filter(String); // Clean empty options - poll.canHostVote = event.canHostVote + poll.canHostVote = event.canHostVote; pollStats = {iterations: 0, responses: {}, winnerSelected: false, winnerName: "", votesReceived: 0, votesCounted: 0 }; emitPrompt(); break; @@ -437,7 +438,7 @@ var isOurPoll = poll.id == message.poll.id; // Tell UI to close poll - _emitEvent({type: "close_poll", change_page: isOurPoll, poll: {id: message.poll.id}}); + _emitEvent({type: "close_poll", changePage: isOurPoll, poll: {id: message.poll.id}}); // Unregister self from poll if (isOurPoll) leavePoll(); @@ -513,7 +514,6 @@ Messages.sendMessage(poll.id, JSON.stringify({type: "sync", poll: poll, pollStats: pollStats})); emitPrompt(); } - } - + } } })(); \ No newline at end of file diff --git a/applications/voting/vote.qml b/applications/voting/vote.qml index 21e82e9..d409b02 100644 --- a/applications/voting/vote.qml +++ b/applications/voting/vote.qml @@ -13,8 +13,8 @@ Rectangle { property var poll: {} property var pollStats: { winnerSelected: false } property bool canHostVote: false - property bool is_host: false - property bool votes_tallied: false + property bool isHost: false + property bool votesTallied: false // Poll List view ColumnLayout { @@ -606,14 +606,14 @@ Rectangle { RowLayout { width: parent.width Layout.alignment: Qt.AlignHCenter - visible: !votes_tallied + visible: !votesTallied // Recast vote Rectangle { width: 150 height: 40 color: "#c0bfbc" - visible: ((is_host && canHostVote) || !is_host) && !pollStats.winnerSelected + visible: ((isHost && canHostVote) || !isHost) && !pollStats.winnerSelected Text { anchors.centerIn: parent @@ -633,13 +633,13 @@ Rectangle { // Host actions RowLayout { - visible: is_host + visible: isHost width: parent.width Layout.alignment: Qt.AlignHCenter // Preform Election Rectangle { - visible: !votes_tallied + visible: !votesTallied width: 150 height: 40 color: "#c0bfbc" @@ -655,14 +655,14 @@ Rectangle { anchors.fill: parent onClicked: { toScript({type: "run_election"}); - votes_tallied = true; + votesTallied = true; } } } // Return to poll settings Rectangle { - visible: !votes_tallied + visible: !votesTallied width: 150 height: 40 color: "#c0bfbc" @@ -684,7 +684,7 @@ Rectangle { // Make a new question Rectangle { - visible: is_host && votes_tallied + visible: isHost && votesTallied width: 150 height: 40 color: "#c0bfbc" @@ -701,7 +701,7 @@ Rectangle { onClicked: { _clearHost(); _changePage("poll_host_view"); - votes_tallied = false; + votesTallied = false; } } } @@ -959,7 +959,7 @@ Rectangle { _changePage("poll_host_view"); // Set variables - is_host = true + isHost = true break; @@ -981,7 +981,7 @@ Rectangle { // Set values _populateClient() - if (is_host) return; + if (isHost) return; _changePage("poll_client_view"); @@ -993,7 +993,7 @@ Rectangle { // Close the poll and remove it from the list of active polls case "close_poll": - if (message.change_page == true) _changePage("poll_list"); + if (message.changePage == true) _changePage("poll_list"); // Find the poll with the matching ID and remove it from active polls for (var i = 0; i < active_polls.count; i++) { @@ -1004,14 +1004,14 @@ Rectangle { } // Set variables - is_host = false + isHost = false poll_to_create_host_can_vote.checked = false; break; case "poll_winner": pollStats = message.pollStats; _populateResults(); - votes_tallied = true; + votesTallied = true; break; case "received_vote": pollStats = message.pollStats; @@ -1021,19 +1021,19 @@ Rectangle { current_page = message.page; if (message.poll) poll = message.poll; if (message.pollStats) pollStats = message.pollStats; - if (message.isHost) is_host = true; + if (message.isHost) isHost = true; if (message.page == "poll_client_view") { _populateClient(); - if (is_host) _populateHost(); + if (isHost) _populateHost(); } if (message.page == "poll_results") { _populateClient(); _populateResults(); - if (is_host) _populateHost(); + if (isHost) _populateHost(); }; if (message.page == "poll_host_view"){ - if (is_host) _populateHost(); + if (isHost) _populateHost(); } break; } From 2243de9cc93f962fcfc5c57e18f39457aa872e85 Mon Sep 17 00:00:00 2001 From: armored-dragon Date: Mon, 16 Sep 2024 13:35:53 -0500 Subject: [PATCH 47/50] Clients can leave polls. --- applications/voting/vote.js | 11 ++++--- applications/voting/vote.qml | 58 +++++++++++++++++++++++++++++++++++- 2 files changed, 62 insertions(+), 7 deletions(-) diff --git a/applications/voting/vote.js b/applications/voting/vote.js index 79e59dc..9e5de4c 100644 --- a/applications/voting/vote.js +++ b/applications/voting/vote.js @@ -15,9 +15,6 @@ // FIXME: Handle ties: kill both of tied results // FIXME: Handle ties: Last two standing are tied. -// STYLE --------------- -// FIXME: Camel case - (() => { "use strict"; let tablet; @@ -340,10 +337,9 @@ if (poll.id) Messages.unsubscribe(poll.id); poll = {id: '', title: '', description: '', host: '', question: '', options: [], canHostVote: false}; - pollStats.responses = {}; - pollStats.iterations = 0; - activePolls = []; + pollStats = {iterations: 0, responses: {}, winnerSelected: false, winnerName: "", votesReceived: 0, votesCounted: 0 }; pollClientState = {isHost: false, hasVoted: false}; + activePolls = []; } function _emitSound(type){ @@ -396,6 +392,9 @@ case "page_name": selectedPage = event.page; break; + case "leave": + leavePoll(); + break; } } /** diff --git a/applications/voting/vote.qml b/applications/voting/vote.qml index d409b02..57e4de2 100644 --- a/applications/voting/vote.qml +++ b/applications/voting/vote.qml @@ -496,6 +496,31 @@ Rectangle { } } } + + // Leave + Rectangle { + width: 150 + height: 40 + color: "#c0bfbc" + visible: !isHost + + Text { + anchors.centerIn: parent + text:"Leave" + color: "black" + font.pointSize:18 + } + + MouseArea { + anchors.fill: parent + + onClicked: { + _clearClient(); + toScript({type: "leave"}); + _changePage("poll_list"); + } + } + } } } } @@ -629,6 +654,31 @@ Rectangle { } } } + + // Leave + Rectangle { + width: 150 + height: 40 + color: "#c0bfbc" + visible: !isHost + + Text { + anchors.centerIn: parent + text:"Leave" + color: "black" + font.pointSize:18 + } + + MouseArea { + anchors.fill: parent + + onClicked: { + _clearClient(); + toScript({type: "leave"}); + _changePage("poll_list"); + } + } + } } // Host actions @@ -922,6 +972,11 @@ Rectangle { poll_to_create_description.text = "Vote on things!"; } + function _clearClient(){ + prompt_question.text = "---"; + poll_option_model.clear(); + } + function _changePage(pageName){ current_page = pageName; toScript({type: "page_name", page: pageName}); @@ -935,6 +990,7 @@ Rectangle { } } function _populateClient() { + _clearClient(); prompt_question.text = poll.question; for (var option of poll.options){ console.log("adding option "+ option); @@ -973,7 +1029,7 @@ Rectangle { active_polls_list.index_selected = -1; // Unselect whatever poll was selected (If one was selected) // Clear options - poll_option_model.clear(); + _clearClient(); poll = message.poll; pollStats = message.pollStats; From 5ef98c7c5b4743f262affff9c78f1c3cb0daeaa2 Mon Sep 17 00:00:00 2001 From: armored-dragon Date: Wed, 18 Sep 2024 05:10:23 -0500 Subject: [PATCH 48/50] Refactored voting engine. Should be more simple to follow. --- applications/voting/vote.js | 98 ++++++------------------------ applications/voting/vote.qml | 1 - applications/voting/vote_engine.js | 98 ++++++++++++++++++++++++++++++ 3 files changed, 118 insertions(+), 79 deletions(-) create mode 100644 applications/voting/vote_engine.js diff --git a/applications/voting/vote.js b/applications/voting/vote.js index 9e5de4c..455fdd3 100644 --- a/applications/voting/vote.js +++ b/applications/voting/vote.js @@ -14,6 +14,7 @@ // TODO: Documentation // FIXME: Handle ties: kill both of tied results // FIXME: Handle ties: Last two standing are tied. +// FIXME: Make the candidate name have reserved value "-1", or change to uncommon name. (() => { "use strict"; @@ -28,6 +29,8 @@ let activePolls = []; // All active polls. let selectedPage = ""; // Selected page the vote screen is on. Used when the host closes the window. + let voteEngine = Script.require("./vote_engine.js"); + const url = Script.resolvePath("./vote.qml"); const myUuid = generateUUID(MyAvatar.sessionUUID); Messages.messageReceived.connect(receivedMessage); @@ -220,88 +223,27 @@ // Take the gathered responses and preform the election // FIXME: Recursive function call function preformElection(){ - let firstVotes = []; // List of first choices from every ballot - let voteResults = {}; // Object that stores the total amount of votes each candidate gets - - // Don't run election if we don't have any votes. - if (Object.keys(pollStats.responses).length == 0) return; - - // Go though each vote received and get the most preferred candidate per ballot. - Object.keys(pollStats.responses).forEach((key) => { - let uuid = key; - let vote = pollStats.responses[uuid]; - - // Assign first vote to new array - firstVotes.push(vote[0]); + + // Format the votes into a format that the election engine can understand + let votesFormatted = []; + const allVoters = Object.keys(pollStats.responses); + allVoters.forEach((voterId) => { + votesFormatted.push(pollStats.responses[voterId]); }); - - // Go through each first choice and increment the total amount of votes per candidate. - for (let i = 0; i < firstVotes.length; i++) { - let candidate = firstVotes[i]; - - // Check if firstVotes index exists - if (!candidate) candidate = -1; // If we have received a "no-vote", just assign -1 - - // Create voteResults index if it does not exist - if (!voteResults[candidate]) voteResults[candidate] = 0; - - // Increment value for each vote - voteResults[candidate]++; - } - - const totalVotes = Object.keys(pollStats.responses).length; // Total votes to expect to be counted. - const majority = Math.floor(totalVotes / 2); // Minimum value to be considered a majority - - const sortedArray = Object.entries(voteResults).sort((a, b) => b[1] - a[1]); - let sortedObject = []; - for (const [key, value] of sortedArray) { - sortedObject.push({ [key]: value }); - } - console.log(`Iteration Votes: ${JSON.stringify(sortedObject, null, 2)}`); - - // Check the most voted for option to see if it makes up over 50% of votes - // NOTE: Has to be *over* 50%. - if (sortedObject[0][Object.keys(sortedObject[0])[0]] > majority) { - let winnerName = Object.keys(sortedObject[0])[0]; - if (winnerName == '-1') winnerName = "No vote"; + const winner = voteEngine.preformVote(votesFormatted); + console.log(`Winner: ${winner.name}`); - pollStats.winnerName = winnerName; - pollStats.votesCounted = totalVotes; - pollStats.winnerSelected = true; + // Update the stats + pollStats.winnerName = winner.name; + pollStats.winnerSelected = true; + pollStats.votesCounted = Object.keys(pollStats.responses).length; + pollStats.iterations = winner.iterations; - // _emitEvent({type: "poll_sync", poll: poll, pollStats: pollStats}); - - Messages.sendMessage(poll.id, JSON.stringify({type: "poll_winner", pollStats: pollStats})); - console.log(`\nWinner: ${winnerName}\nElection rounds: ${pollStats.iterations}\nVotes counted: ${totalVotes}`); - pollStats.responses = {}; - return; // Winner was selected. We are done! - }; - - // If there is not a majority vote, remove the least popular candidate and call preformElection() again - let leastPopularIndex = sortedObject.length - 1; - let leastPopular = Object.keys(sortedObject[leastPopularIndex])[0]; - - // Check to see if least popular is "-1"/"no-vote" - if (leastPopular === "-1") { - leastPopularIndex--; - leastPopular = Object.keys(sortedObject[leastPopularIndex])[0]; // Get the real leastPopular candidate - } - - console.log(`Removing least popular: ${leastPopular}`); - - // Go into each vote and delete the selected least popular candidate - Object.keys(pollStats.responses).forEach((uuid) => { - // Remove the least popular candidate from each vote. - if (pollStats.responses[uuid].indexOf(leastPopular) != -1) pollStats.responses[uuid].splice(pollStats.responses[uuid].indexOf(leastPopular), 1); - console.log(pollStats.responses[uuid]); - }); - - // Update statistics - pollStats.iterations++; - - // Run again - preformElection(); + // Synchronize the winner with all clients + Messages.sendMessage(poll.id, JSON.stringify({type: "poll_winner", pollStats: pollStats})); + pollStats.responses = {}; + return; } // Create a UUID or turn an existing UUID into a string diff --git a/applications/voting/vote.qml b/applications/voting/vote.qml index 57e4de2..15c4524 100644 --- a/applications/voting/vote.qml +++ b/applications/voting/vote.qml @@ -626,7 +626,6 @@ Rectangle { } } - // TODO: Style: Not centered. Remake. // Client actions RowLayout { width: parent.width diff --git a/applications/voting/vote_engine.js b/applications/voting/vote_engine.js new file mode 100644 index 0000000..0dfc5bc --- /dev/null +++ b/applications/voting/vote_engine.js @@ -0,0 +1,98 @@ +/* +[ + ["", "", "", "", ""], // Each entry in the array is an array of strings. + ["", "", "", "", ""], // Each entry is a separate vote received from a participant. + ["", "", "", "" ], // There may be entries missing as a form of "non-vote" + [ ] // There may just be an empty array. +] +*/ + +let ballotsStorage = []; +let iterations = 0; + +function preformVote(arrayOfBallots) { + if (ballotsStorage.length === 0) { + ballotsStorage = arrayOfBallots + print(JSON.stringify(ballotsStorage, null, 4)); + }; + + const totalAmountOfVotes = ballotsStorage.length; + let firstChoices = {}; + + if (totalAmountOfVotes === 0) return; // No votes, no results. + iterations++; + + // Go though each ballot and count the first choice for each + for (let ballotIndex = 0; ballotIndex < totalAmountOfVotes; ballotIndex++) { + const firstChoice = ballotsStorage[ballotIndex][0]; + + // Convert "undefined" to "-1" as a non vote. + if (!firstChoice) { + if (!firstChoices["-1"]) firstChoices["-1"] = 0; + firstChoices["-1"]++; + continue; + } + + // Keep track of the most preferred candidate. + if (!firstChoices[firstChoice]) firstChoices[firstChoice] = 0; + firstChoices[firstChoice]++; + } + + // At this point we have a map of the first choices. + // Now we need to find the candidates that have the lowest amount of votes. + // Exclude candidates that have a name of "-1". This is considered a non vote. + // We look for the lowest voted for candidate, take their amount of votes, and look for other candidates that share this value. + let lowestVoteAmount = Infinity; + let highestVoteAmount = -Infinity; + let highestVoteCandidate = ""; + // let highestVoteCandidateTied = false; // If there are multiple candidates with the same amount of votes. TODO + + // Find the lowest amount of votes for a candidate + Object.keys(firstChoices).forEach((candidate) => { + if (firstChoices[candidate] > highestVoteAmount) { + highestVoteAmount = firstChoices[candidate]; + highestVoteCandidate = candidate; + }; + + if (candidate === "-1") return; // Never eliminate -1 + if (firstChoices[candidate] < lowestVoteAmount) lowestVoteAmount = firstChoices[candidate]; + }); + + // Check to see if we have a winner. + // A winner is chosen when they have a total vote amount that is more than half of the total votes. + // print(JSON.stringify(firstChoices, null, 4)); + // print(`Is ${highestVoteAmount} > ${Math.floor(ballotsStorage.length / 2)}`); + // TODO: Check for ties + if (highestVoteAmount > Math.floor(ballotsStorage.length / 2)) { + const returnValue = {name: highestVoteCandidate, iterations: iterations}; + iterations = 0; // Reset iterations. + ballotsStorage = []; // Reset the ballots array. + return returnValue; + } + + // Make a list of candidates that share the lowest vote + // These will be the candidates that will be removed before the next "round/iteration" of elimination + let candidatesWithSameLowestVote = []; + + Object.keys(firstChoices).forEach((candidate) => { + if (candidate === "-1") return; + + if (firstChoices[candidate] == lowestVoteAmount) candidatesWithSameLowestVote.push(candidate); + }); + + print(`Lowest amount of votes: ${lowestVoteAmount}`); + print(`Removing candidates: ${candidatesWithSameLowestVote}`); + + // Remove all candidates with the lowest vote amount from the first choices + for (let ballotIndex = 0; ballotIndex < totalAmountOfVotes; ballotIndex++) { + const firstChoice = ballotsStorage[ballotIndex][0]; + + if (candidatesWithSameLowestVote.includes(firstChoice)) { + ballotsStorage[ballotIndex].shift(); // Remove the first choice from this ballot + } + } + + return preformVote(ballotsStorage); +} + +module.exports = { preformVote }; From 71ed32cb19697e5ff33cc6df8397f53321fd5893 Mon Sep 17 00:00:00 2001 From: armored-dragon Date: Wed, 18 Sep 2024 06:18:30 -0500 Subject: [PATCH 49/50] Handle ties. Fix running without casted votes causing exception. --- applications/voting/vote.js | 11 +++++---- applications/voting/vote_engine.js | 38 ++++++++++++++++++++++++++---- 2 files changed, 39 insertions(+), 10 deletions(-) diff --git a/applications/voting/vote.js b/applications/voting/vote.js index 455fdd3..9077295 100644 --- a/applications/voting/vote.js +++ b/applications/voting/vote.js @@ -12,8 +12,6 @@ /* global Script Tablet Messages MyAvatar AvatarList Uuid SoundCache*/ // TODO: Documentation -// FIXME: Handle ties: kill both of tied results -// FIXME: Handle ties: Last two standing are tied. // FIXME: Make the candidate name have reserved value "-1", or change to uncommon name. (() => { @@ -232,10 +230,13 @@ }); const winner = voteEngine.preformVote(votesFormatted); - console.log(`Winner: ${winner.name}`); + if (!winner) return; + const winnerName = winner?.tie ? winner.name.join(', ') : winner.name; + + console.log(`Winner: ${winnerName}`); // Update the stats - pollStats.winnerName = winner.name; + pollStats.winnerName = winnerName; pollStats.winnerSelected = true; pollStats.votesCounted = Object.keys(pollStats.responses).length; pollStats.iterations = winner.iterations; @@ -323,7 +324,7 @@ case "run_election": // Debug: Create a lot of fake ballots if (debug) { - for (let i = 0; i < 25; ++i) { + for (let i = 0; i < 26; ++i) { _debugDummyBallot(); } } diff --git a/applications/voting/vote_engine.js b/applications/voting/vote_engine.js index 0dfc5bc..f414a61 100644 --- a/applications/voting/vote_engine.js +++ b/applications/voting/vote_engine.js @@ -19,7 +19,7 @@ function preformVote(arrayOfBallots) { const totalAmountOfVotes = ballotsStorage.length; let firstChoices = {}; - if (totalAmountOfVotes === 0) return; // No votes, no results. + if (totalAmountOfVotes === 0) return null; // No votes, no results. iterations++; // Go though each ballot and count the first choice for each @@ -45,7 +45,7 @@ function preformVote(arrayOfBallots) { let lowestVoteAmount = Infinity; let highestVoteAmount = -Infinity; let highestVoteCandidate = ""; - // let highestVoteCandidateTied = false; // If there are multiple candidates with the same amount of votes. TODO + let candidatesWithSameHighestVote = []; // Array of the highest voted for candidates // Find the lowest amount of votes for a candidate Object.keys(firstChoices).forEach((candidate) => { @@ -58,15 +58,43 @@ function preformVote(arrayOfBallots) { if (firstChoices[candidate] < lowestVoteAmount) lowestVoteAmount = firstChoices[candidate]; }); + // print(JSON.stringify(firstChoices, null, 4)); + // Check to see if there are multiple candidates with the highest amount of votes + Object.keys(firstChoices).forEach((candidate) => { + // print(`Is ${firstChoices[candidate]} == ${highestVoteAmount}?`); + if (firstChoices[candidate] == highestVoteAmount) { + candidatesWithSameHighestVote.push(candidate); + // print(`Pushing ${candidate}`); + } + }); + // Check to see if we have a winner. // A winner is chosen when they have a total vote amount that is more than half of the total votes. - // print(JSON.stringify(firstChoices, null, 4)); // print(`Is ${highestVoteAmount} > ${Math.floor(ballotsStorage.length / 2)}`); - // TODO: Check for ties - if (highestVoteAmount > Math.floor(ballotsStorage.length / 2)) { + // Simple check for a winner. + if (highestVoteAmount > Math.floor(ballotsStorage.length / 2) && candidatesWithSameHighestVote.length == 1) { const returnValue = {name: highestVoteCandidate, iterations: iterations}; iterations = 0; // Reset iterations. ballotsStorage = []; // Reset the ballots array. + print("Normal exit"); + return returnValue; + } + + /* + [ "Hello", "World", "Goodbye", "-1" ], + [ "World", "Hello", "Goodbye", "-1" ], + [ "Hello", "World", "Goodbye" ], + [ "World", ], + [ ], + */ + + // TODO: Check to see if this tie handling works. + if(candidatesWithSameHighestVote.length > 1 && candidatesWithSameHighestVote.length == Object.keys(firstChoices).length){ + // We have a tie, show the tie + const returnValue = {name: candidatesWithSameHighestVote, iterations: iterations, tie: true}; + iterations = 0; // Reset iterations. + ballotsStorage = []; // Reset the ballots array. + print("Tie exit"); return returnValue; } From 29805a07f878e9656e9a3de03e649a47ef33d291 Mon Sep 17 00:00:00 2001 From: armored-dragon Date: Wed, 18 Sep 2024 06:34:19 -0500 Subject: [PATCH 50/50] Fixed client being unable to leave when votes are tallied. --- applications/voting/vote.qml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/applications/voting/vote.qml b/applications/voting/vote.qml index 15c4524..386409a 100644 --- a/applications/voting/vote.qml +++ b/applications/voting/vote.qml @@ -630,14 +630,13 @@ Rectangle { RowLayout { width: parent.width Layout.alignment: Qt.AlignHCenter - visible: !votesTallied // Recast vote Rectangle { width: 150 height: 40 color: "#c0bfbc" - visible: ((isHost && canHostVote) || !isHost) && !pollStats.winnerSelected + visible: ((isHost && canHostVote) || !isHost) && !pollStats.winnerSelected && !votesTallied Text { anchors.centerIn: parent