Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

IOT tool to send messages to Dweet - https://github.com/apache/openmeetings/issues/102 #103

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
+628 −1
Open

IOT tool to send messages to Dweet - https://github.com/apache/openmeetings/issues/102 #103

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b531004
add dweet btn in toolbar and open window in wb
gkrthk Jun 27, 2020
7deed34
fix drag and resize popup
gkrthk Jun 28, 2020
e13ecb2
dwwet api integration send dweet
gkrthk Jul 14, 2020
11deb7d
response section added
gkrthk Jul 24, 2020
6971422
update pop up name
gkrthk Jul 26, 2020
a68e7af
comments incorporated
gkrthk Dec 7, 2020
fd14c0e
incorporate comments
gkrthk Dec 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions openmeetings-web/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,8 @@
<jsSourceFile>raw-tool-arrow.js</jsSourceFile>
<jsSourceFile>raw-tool-clipart.js</jsSourceFile>
<jsSourceFile>raw-wb-board.js</jsSourceFile>
<jsSourceFile>raw-wb-area.js</jsSourceFile>
<jsSourceFile>raw-wb-area.js</jsSourceFile>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please do not create trailing spaces

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

<jsSourceFile>dweet-io.js</jsSourceFile>
</jsSourceFiles>
<jsFinalFile>wb.js</jsFinalFile>
<jsTargetDir>../generated-sources/main/java/org/apache/openmeetings/web/room/wb/</jsTargetDir>
Expand Down Expand Up @@ -264,7 +265,7 @@
<jsEngine>CLOSURE</jsEngine>
<jsTargetDir>../generated-sources/main/java/org/apache/openmeetings/web/user/chat</jsTargetDir>
</configuration>
</execution>
</execution>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please do not create trailing spaces

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

</executions>
</plugin>
<plugin>
Expand Down
4 changes: 4 additions & 0 deletions openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -960,4 +960,8 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="wizard.button.finish"><![CDATA[Finish]]></entry>
<entry key="zoom.FULL_FIT"><![CDATA[Full-Fit]]></entry>
<entry key="zoom.PAGE_WIDTH"><![CDATA[Page Width]]></entry>
<entry key="wb.tool.dweet"><![CDATA[Dweet IOT Messaging]]></entry>
<entry key="wb.tool.dweet.mything"><![CDATA[MyThing]]></entry>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is not clear what MyThing should mean

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"MyThing " is the term used by Dweet for an object ( fridge, light ) to be controlled.

To make this clearer for the user we could add an example object in the text field: MyThing: ..Light ...........

<entry key="wb.tool.dweet.context"><![CDATA[Data]]></entry>
<entry key="wb.tool.dweet.response"><![CDATA[Response]]></entry>
</properties>
30 changes: 30 additions & 0 deletions openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.html
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,7 @@
<div wicket:message="title:72" class="clickable om-icon big pointer"></div>
<div wicket:message="title:557" class="clickable om-icon big apointer"></div>
<div wicket:message="title:wb.tool.math.formula" class="clickable om-icon big math"></div>
<div wicket:message="title:wb.tool.dweet" class="clickable om-icon big dweet"></div>
<div wicket:message="title:843" class="clickable om-icon big settings"></div>
</div>
<div id="wb-tools-readonly">
Expand Down Expand Up @@ -208,6 +209,35 @@
</div>
<div class="status"></div>
</div>
<div id="wb-dweet" class="wb-formula ui-corner-all ui-widget-content">
<div wicket:message="title:wb.tool.dweet" class="header ui-dialog-titlebar ui-corner-all ui-widget-header ui-helper-clearfix ui-draggable-handle">
<span class="ui-dialog-title"><wicket:message key="wb.tool.dweet"/></span>
</div>
<button type="button" class="ui-button ui-corner-all ui-widget ui-button-icon-only ui-dialog-titlebar-close" wicket:message="title:85">
<span class="ui-button-icon ui-icon ui-icon-closethick"></span>
<span class="ui-button-icon-space"> </span>
<wicket:message key="85"/>
</button>
<div>
<div class="text-container">
<div class="dweet-inline lbl" wicket:message="title:wb.tool.dweet.mything"><wicket:message key="wb.tool.dweet.mything"/></div>
<div class="dweet-inline input"><input class="wb-dim-x" type="text" /></div>
</div>
<div class="text-container">
<div class="lbl" wicket:message="title:wb.tool.dweet.context"><wicket:message key="wb.tool.dweet.context"/></div>
<div class="input"><textarea class="dweet-input" placeholder='{"hello":"world","foo": "bar"}'></textarea></div>
</div>
<div class="text-container">
<div class="lbl" wicket:message="title:wb.tool.dweet.response"><wicket:message key="wb.tool.dweet.response"/></div>
<div class="input"><textarea readonly="true" class="dweet-input dweet-response"></textarea>
</div>
</div>
</div>
<div>
<button class="update-btn dweet-btn"><wicket:message key="lbl.update"/></button>
</div>
<div class="status"></div>
</div>
</div>
<div id="wb-settings" class="wb-settings modal fade" tabindex="-1" role="dialog" data-backdrop="false" aria-hidden="true">
<div class="modal-dialog modal-sm" role="document">
Expand Down
Loading