csmith1865/obscreen
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 16 Wiki Activity

fully working user info about slide edition

Browse Source
This commit is contained in:
jr-k 2024-05-13 01:38:04 +02:00
parent d28b8919eb
commit 6b0e0e9a41
12 changed files with 70 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
data/www/css/main.css
View File

@ -618,14 +618,14 @@ form .actions button.green:hover {
border-color: rgb(14, 239, 95);
}
form .actions button.modal-close {
form .actions button.btn-normal {
color: #999;
border-color: #999;
font-size: 18px;
margin: 0;
}
form .actions button.modal-close:hover {
form .actions button.btn-normal:hover {
color: #555;
border-color: #555;
}

9
data/www/js/slideshow.js
View File

@ -13,6 +13,10 @@ jQuery(document).ready(function ($) {
return `${year}-${month.padStart(2, '0')}-${day.padStart(2, '0')} ${hours.padStart(2, '0')}:${minutes.padStart(2, '0')}`;
};
const prettyTimestamp = function(timestamp) {
const d = new Date(timestamp);
return `${d.getFullYear()}-${String(d.getMonth()).padStart(2, '0')}-${String(d.getDate()).padStart(2, '0')} ${String(d.getHours()).padStart(2, '0')}:${String(d.getMinutes()).padStart(2, '0')}:${String(d.getSeconds()).padStart(2, '0')} `
}
const loadDateTimePicker = function($el) {
$el.val('');
@ -157,8 +161,9 @@ jQuery(document).ready(function ($) {
showModal('modal-slide-utrack');
$('#slide-utrack-created-by').val(slide.created_by);
$('#slide-utrack-updated-by').val(slide.updated_by);
$('#slide-utrack-created-at').val(slide.created_at);
$('#slide-utrack-created-at').val(slide.updated_at);
console.log(slide.created_at)
$('#slide-utrack-created-at').val(prettyTimestamp(slide.created_at * 1000));
$('#slide-utrack-created-at').val(prettyTimestamp(slide.updated_at * 1000));
});
$(document).on('click', '.slide-edit', function () {

9
src/model/entity/Slide.py
View File

@ -140,8 +140,13 @@ class Slide:
f"cron_schedule_end='{self.cron_schedule_end}',\n" \
f")"
def to_json(self) -> str:
return json.dumps(self.to_dict(with_virtual=True))
def to_json(self, edits: dict = {}) -> str:
obj = self.to_dict(with_virtual=True)
for k,v in edits.items():
obj[k] = v
return json.dumps(obj)
def to_dict(self, with_virtual: bool = False) -> dict:
slide = {

2
views/auth/modal/add.jinja.html
View File

@ -19,7 +19,7 @@
</div>
<div class="actions">
<button type="button" class="modal-close">
<button type="button" class="btn-normal modal-close">
{{ l.auth_user_form_button_cancel }}
</button>
<button type="submit" class="green">

2
views/auth/modal/edit.jinja.html
View File

@ -21,7 +21,7 @@
</div>
<div class="actions">
<button type="button" class="modal-close">
<button type="button" class="btn-normal odal-close">
{{ l.auth_user_form_button_cancel }}
</button>
<button type="submit" class="green">

2
views/fleet/modal/add.jinja.html
View File

@ -26,7 +26,7 @@
</div>
<div class="actions">
<button type="button" class="modal-close">
<button type="button" class="btn-normal modal-close">
{{ l.fleet_screen_form_button_cancel }}
</button>
<button type="submit" class="green">

2
views/fleet/modal/edit.jinja.html
View File

@ -28,7 +28,7 @@
</div>
<div class="actions">
<button type="button" class="modal-close">
<button type="button" class="btn-normal modal-close">
{{ l.fleet_screen_form_button_cancel }}
</button>
<button type="submit" class="green">

2
views/settings/modal/edit.jinja.html
View File

@ -26,7 +26,7 @@
</div>
<div class="actions">
<button type="button" class="modal-close">
<button type="button" class="btn-normal modal-close">
{{ l.settings_variable_form_button_cancel }}
</button>
<button type="submit" class="green">

5
views/slideshow/component/table.jinja.html
View File

@ -23,7 +23,10 @@
</td>
</tr>
{% for slide in slides %}
<tr class="slide-item" data-level="{{ slide.id }}" data-entity="{{ slide.to_json() }}">
<tr class="slide-item" data-level="{{ slide.id }}" data-entity="{{ slide.to_json({
"created_by": track_created(slide).username,
"updated_by": track_updated(slide).username
}) }}">
<td class="infos">
<div class="inner">
<a href="javascript:void(0);" class="item-sort slide-sort">

2
views/slideshow/modal/add.jinja.html
View File

@ -75,7 +75,7 @@
</div>
<div class="actions">
<button type="button" class="modal-close">
<button type="button" class="btn-normal modal-close">
{{ l.slideshow_slide_form_button_cancel }}
</button>
<button type="submit" class="green">

2
views/slideshow/modal/edit.jinja.html
View File

@ -78,7 +78,7 @@
</div>
<div class="actions">
<button type="button" class="modal-close">
<button type="button" class="btn-normal modal-close">
{{ l.slideshow_slide_form_button_cancel }}
</button>
<button type="submit" class="green">

43
views/slideshow/modal/utrack.jinja.html Normal file
View File

@ -0,0 +1,43 @@
<div class="modal modal-slide-utrack modal-slide">
<h2>
{{ l.utrack_title }}
</h2>
<form action="/slideshow/slide/add" method="POST" enctype="multipart/form-data">
<div class="form-group">
<label>{{ l.created_by }}</label>
<div class="widget">
<input name="name" type="text" id="slide-utrack-created-by" disabled="disabled" />
</div>
</div>
<div class="form-group">
<label>{{ l.updated_by }}</label>
<div class="widget">
<input name="name" type="text" id="slide-utrack-updated-by" disabled="disabled" />
</div>
</div>
<div class="form-group">
<label>{{ l.created_at }}</label>
<div class="widget">
<input name="name" type="text" id="slide-utrack-created-at" disabled="disabled" />
</div>
</div>
<div class="form-group">
<label>{{ l.updated_at }}</label>
<div class="widget">
<input name="name" type="text" id="slide-utrack-updated-at" disabled="disabled" />
</div>
</div>
<div class="actions">
<button type="button" class="btn-normal modal-close">
{{ l.close }}
</button>
</div>
</form>
</div>