Compare commits
1 commit
Author | SHA1 | Date | |
---|---|---|---|
479c9eb192 |
66 changed files with 1718 additions and 1878 deletions
data
docs
framadate
__init__.pyadmin.pyapps.py
migrations
models.pystatic/framadate
templates/framadate
tests.pyurls.pyviews.pykorektury
admin.pyurls.pyutils.pyviews.py
api
forms.pymigrations
0025_remove_oprava_autor_remove_oprava_text.py0026_oprava_informovani_orgove.py0027_korekturatag_oprava_tagy.py
models.pystatic/korektury
templates/korektury
korekturovatko
__dalsi_korektura.html__edit_komentar.html__komentar.html__oprava.html__stranky.html_main.html_schovani_korektur.html_zmena_stavu.htmlhtmlstrana.html
opraf.htmlmake
mamweb
odevzdavatko
prednasky
__init__.pyadmin.pyforms.py
requirements.txtmigrations
0019_znalost_hlasovanioznalostech.py0020_alter_hlasovani_body.py0021_alter_hlasovanioznalostech_odpoved.py0022_preklep_u_odpovedi_hlasovanioznalostech.py
models.pytemplates/prednasky
urls.pyviews.pytvorba/views
140
data/groups.json
140
data/groups.json
|
@ -14,12 +14,12 @@
|
|||
"flatpage"
|
||||
],
|
||||
[
|
||||
"change_flatpage",
|
||||
"delete_flatpage",
|
||||
"flatpages",
|
||||
"flatpage"
|
||||
],
|
||||
[
|
||||
"delete_flatpage",
|
||||
"change_flatpage",
|
||||
"flatpages",
|
||||
"flatpage"
|
||||
],
|
||||
|
@ -34,12 +34,12 @@
|
|||
"galerie"
|
||||
],
|
||||
[
|
||||
"change_galerie",
|
||||
"delete_galerie",
|
||||
"galerie",
|
||||
"galerie"
|
||||
],
|
||||
[
|
||||
"delete_galerie",
|
||||
"change_galerie",
|
||||
"galerie",
|
||||
"galerie"
|
||||
],
|
||||
|
@ -54,12 +54,12 @@
|
|||
"obrazek"
|
||||
],
|
||||
[
|
||||
"change_obrazek",
|
||||
"delete_obrazek",
|
||||
"galerie",
|
||||
"obrazek"
|
||||
],
|
||||
[
|
||||
"delete_obrazek",
|
||||
"change_obrazek",
|
||||
"galerie",
|
||||
"obrazek"
|
||||
],
|
||||
|
@ -104,12 +104,12 @@
|
|||
"komentar"
|
||||
],
|
||||
[
|
||||
"change_komentar",
|
||||
"delete_komentar",
|
||||
"korektury",
|
||||
"komentar"
|
||||
],
|
||||
[
|
||||
"delete_komentar",
|
||||
"change_komentar",
|
||||
"korektury",
|
||||
"komentar"
|
||||
],
|
||||
|
@ -124,12 +124,12 @@
|
|||
"korekturovanepdf"
|
||||
],
|
||||
[
|
||||
"change_korekturovanepdf",
|
||||
"delete_korekturovanepdf",
|
||||
"korektury",
|
||||
"korekturovanepdf"
|
||||
],
|
||||
[
|
||||
"delete_korekturovanepdf",
|
||||
"change_korekturovanepdf",
|
||||
"korektury",
|
||||
"korekturovanepdf"
|
||||
],
|
||||
|
@ -144,12 +144,12 @@
|
|||
"oprava"
|
||||
],
|
||||
[
|
||||
"change_oprava",
|
||||
"delete_oprava",
|
||||
"korektury",
|
||||
"oprava"
|
||||
],
|
||||
[
|
||||
"delete_oprava",
|
||||
"change_oprava",
|
||||
"korektury",
|
||||
"oprava"
|
||||
],
|
||||
|
@ -164,12 +164,12 @@
|
|||
"novinky"
|
||||
],
|
||||
[
|
||||
"change_novinky",
|
||||
"delete_novinky",
|
||||
"novinky",
|
||||
"novinky"
|
||||
],
|
||||
[
|
||||
"delete_novinky",
|
||||
"change_novinky",
|
||||
"novinky",
|
||||
"novinky"
|
||||
],
|
||||
|
@ -204,12 +204,12 @@
|
|||
"prijemce"
|
||||
],
|
||||
[
|
||||
"change_prijemce",
|
||||
"delete_prijemce",
|
||||
"personalni",
|
||||
"prijemce"
|
||||
],
|
||||
[
|
||||
"delete_prijemce",
|
||||
"change_prijemce",
|
||||
"personalni",
|
||||
"prijemce"
|
||||
],
|
||||
|
@ -234,12 +234,12 @@
|
|||
"skola"
|
||||
],
|
||||
[
|
||||
"change_skola",
|
||||
"delete_skola",
|
||||
"personalni",
|
||||
"skola"
|
||||
],
|
||||
[
|
||||
"delete_skola",
|
||||
"change_skola",
|
||||
"personalni",
|
||||
"skola"
|
||||
],
|
||||
|
@ -249,14 +249,24 @@
|
|||
"skola"
|
||||
],
|
||||
[
|
||||
"view_hlasovani",
|
||||
"add_hlasovani",
|
||||
"prednasky",
|
||||
"hlasovani"
|
||||
],
|
||||
[
|
||||
"view_hlasovanioznalostech",
|
||||
"delete_hlasovani",
|
||||
"prednasky",
|
||||
"hlasovanioznalostech"
|
||||
"hlasovani"
|
||||
],
|
||||
[
|
||||
"change_hlasovani",
|
||||
"prednasky",
|
||||
"hlasovani"
|
||||
],
|
||||
[
|
||||
"view_hlasovani",
|
||||
"prednasky",
|
||||
"hlasovani"
|
||||
],
|
||||
[
|
||||
"add_prednaska",
|
||||
|
@ -264,12 +274,12 @@
|
|||
"prednaska"
|
||||
],
|
||||
[
|
||||
"change_prednaska",
|
||||
"delete_prednaska",
|
||||
"prednasky",
|
||||
"prednaska"
|
||||
],
|
||||
[
|
||||
"delete_prednaska",
|
||||
"change_prednaska",
|
||||
"prednasky",
|
||||
"prednaska"
|
||||
],
|
||||
|
@ -284,12 +294,12 @@
|
|||
"seznam"
|
||||
],
|
||||
[
|
||||
"change_seznam",
|
||||
"delete_seznam",
|
||||
"prednasky",
|
||||
"seznam"
|
||||
],
|
||||
[
|
||||
"delete_seznam",
|
||||
"change_seznam",
|
||||
"prednasky",
|
||||
"seznam"
|
||||
],
|
||||
|
@ -298,38 +308,18 @@
|
|||
"prednasky",
|
||||
"seznam"
|
||||
],
|
||||
[
|
||||
"add_znalost",
|
||||
"prednasky",
|
||||
"znalost"
|
||||
],
|
||||
[
|
||||
"change_znalost",
|
||||
"prednasky",
|
||||
"znalost"
|
||||
],
|
||||
[
|
||||
"delete_znalost",
|
||||
"prednasky",
|
||||
"znalost"
|
||||
],
|
||||
[
|
||||
"view_znalost",
|
||||
"prednasky",
|
||||
"znalost"
|
||||
],
|
||||
[
|
||||
"add_konfera",
|
||||
"soustredeni",
|
||||
"konfera"
|
||||
],
|
||||
[
|
||||
"change_konfera",
|
||||
"delete_konfera",
|
||||
"soustredeni",
|
||||
"konfera"
|
||||
],
|
||||
[
|
||||
"delete_konfera",
|
||||
"change_konfera",
|
||||
"soustredeni",
|
||||
"konfera"
|
||||
],
|
||||
|
@ -344,12 +334,12 @@
|
|||
"konfery_ucastnici"
|
||||
],
|
||||
[
|
||||
"change_konfery_ucastnici",
|
||||
"delete_konfery_ucastnici",
|
||||
"soustredeni",
|
||||
"konfery_ucastnici"
|
||||
],
|
||||
[
|
||||
"delete_konfery_ucastnici",
|
||||
"change_konfery_ucastnici",
|
||||
"soustredeni",
|
||||
"konfery_ucastnici"
|
||||
],
|
||||
|
@ -364,12 +354,12 @@
|
|||
"soustredeni"
|
||||
],
|
||||
[
|
||||
"change_soustredeni",
|
||||
"delete_soustredeni",
|
||||
"soustredeni",
|
||||
"soustredeni"
|
||||
],
|
||||
[
|
||||
"delete_soustredeni",
|
||||
"change_soustredeni",
|
||||
"soustredeni",
|
||||
"soustredeni"
|
||||
],
|
||||
|
@ -384,12 +374,12 @@
|
|||
"soustredeni_organizatori"
|
||||
],
|
||||
[
|
||||
"change_soustredeni_organizatori",
|
||||
"delete_soustredeni_organizatori",
|
||||
"soustredeni",
|
||||
"soustredeni_organizatori"
|
||||
],
|
||||
[
|
||||
"delete_soustredeni_organizatori",
|
||||
"change_soustredeni_organizatori",
|
||||
"soustredeni",
|
||||
"soustredeni_organizatori"
|
||||
],
|
||||
|
@ -404,12 +394,12 @@
|
|||
"soustredeni_ucastnici"
|
||||
],
|
||||
[
|
||||
"change_soustredeni_ucastnici",
|
||||
"delete_soustredeni_ucastnici",
|
||||
"soustredeni",
|
||||
"soustredeni_ucastnici"
|
||||
],
|
||||
[
|
||||
"delete_soustredeni_ucastnici",
|
||||
"change_soustredeni_ucastnici",
|
||||
"soustredeni",
|
||||
"soustredeni_ucastnici"
|
||||
],
|
||||
|
@ -424,12 +414,12 @@
|
|||
"tag"
|
||||
],
|
||||
[
|
||||
"change_tag",
|
||||
"delete_tag",
|
||||
"taggit",
|
||||
"tag"
|
||||
],
|
||||
[
|
||||
"delete_tag",
|
||||
"change_tag",
|
||||
"taggit",
|
||||
"tag"
|
||||
],
|
||||
|
@ -444,12 +434,12 @@
|
|||
"taggeditem"
|
||||
],
|
||||
[
|
||||
"change_taggeditem",
|
||||
"delete_taggeditem",
|
||||
"taggit",
|
||||
"taggeditem"
|
||||
],
|
||||
[
|
||||
"delete_taggeditem",
|
||||
"change_taggeditem",
|
||||
"taggit",
|
||||
"taggeditem"
|
||||
],
|
||||
|
@ -464,12 +454,12 @@
|
|||
"cislo"
|
||||
],
|
||||
[
|
||||
"change_cislo",
|
||||
"delete_cislo",
|
||||
"tvorba",
|
||||
"cislo"
|
||||
],
|
||||
[
|
||||
"delete_cislo",
|
||||
"change_cislo",
|
||||
"tvorba",
|
||||
"cislo"
|
||||
],
|
||||
|
@ -484,12 +474,12 @@
|
|||
"clanek"
|
||||
],
|
||||
[
|
||||
"change_clanek",
|
||||
"delete_clanek",
|
||||
"tvorba",
|
||||
"clanek"
|
||||
],
|
||||
[
|
||||
"delete_clanek",
|
||||
"change_clanek",
|
||||
"tvorba",
|
||||
"clanek"
|
||||
],
|
||||
|
@ -519,12 +509,12 @@
|
|||
"pohadka"
|
||||
],
|
||||
[
|
||||
"change_pohadka",
|
||||
"delete_pohadka",
|
||||
"tvorba",
|
||||
"pohadka"
|
||||
],
|
||||
[
|
||||
"delete_pohadka",
|
||||
"change_pohadka",
|
||||
"tvorba",
|
||||
"pohadka"
|
||||
],
|
||||
|
@ -539,12 +529,12 @@
|
|||
"problem"
|
||||
],
|
||||
[
|
||||
"change_problem",
|
||||
"delete_problem",
|
||||
"tvorba",
|
||||
"problem"
|
||||
],
|
||||
[
|
||||
"delete_problem",
|
||||
"change_problem",
|
||||
"tvorba",
|
||||
"problem"
|
||||
],
|
||||
|
@ -559,12 +549,12 @@
|
|||
"rocnik"
|
||||
],
|
||||
[
|
||||
"change_rocnik",
|
||||
"delete_rocnik",
|
||||
"tvorba",
|
||||
"rocnik"
|
||||
],
|
||||
[
|
||||
"delete_rocnik",
|
||||
"change_rocnik",
|
||||
"tvorba",
|
||||
"rocnik"
|
||||
],
|
||||
|
@ -579,12 +569,12 @@
|
|||
"tema"
|
||||
],
|
||||
[
|
||||
"change_tema",
|
||||
"delete_tema",
|
||||
"tvorba",
|
||||
"tema"
|
||||
],
|
||||
[
|
||||
"delete_tema",
|
||||
"change_tema",
|
||||
"tvorba",
|
||||
"tema"
|
||||
],
|
||||
|
@ -599,12 +589,12 @@
|
|||
"uloha"
|
||||
],
|
||||
[
|
||||
"change_uloha",
|
||||
"delete_uloha",
|
||||
"tvorba",
|
||||
"uloha"
|
||||
],
|
||||
[
|
||||
"delete_uloha",
|
||||
"change_uloha",
|
||||
"tvorba",
|
||||
"uloha"
|
||||
],
|
||||
|
@ -619,12 +609,12 @@
|
|||
"nastaveni"
|
||||
],
|
||||
[
|
||||
"change_nastaveni",
|
||||
"delete_nastaveni",
|
||||
"various",
|
||||
"nastaveni"
|
||||
],
|
||||
[
|
||||
"delete_nastaveni",
|
||||
"change_nastaveni",
|
||||
"various",
|
||||
"nastaveni"
|
||||
],
|
||||
|
|
|
@ -36,7 +36,6 @@ extensions = [
|
|||
'sphinx.ext.intersphinx',
|
||||
'sphinx.ext.autosectionlabel',
|
||||
'myst_parser',
|
||||
'sphinxcontrib_django',
|
||||
]
|
||||
|
||||
# Add any paths that contain templates here, relative to this directory.
|
||||
|
|
3
framadate/admin.py
Normal file
3
framadate/admin.py
Normal file
|
@ -0,0 +1,3 @@
|
|||
from django.contrib import admin
|
||||
|
||||
# Register your models here.
|
6
framadate/apps.py
Normal file
6
framadate/apps.py
Normal file
|
@ -0,0 +1,6 @@
|
|||
from django.apps import AppConfig
|
||||
|
||||
|
||||
class FramadateConfig(AppConfig):
|
||||
default_auto_field = 'django.db.models.BigAutoField'
|
||||
name = 'framadate'
|
54
framadate/migrations/0001_initial.py
Normal file
54
framadate/migrations/0001_initial.py
Normal file
|
@ -0,0 +1,54 @@
|
|||
# Generated by Django 4.2.16 on 2025-01-26 17:14
|
||||
|
||||
from django.db import migrations, models
|
||||
import django.db.models.deletion
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
initial = True
|
||||
|
||||
dependencies = [
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.CreateModel(
|
||||
name='Framadate',
|
||||
fields=[
|
||||
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
||||
('name', models.TextField()),
|
||||
],
|
||||
),
|
||||
migrations.CreateModel(
|
||||
name='FramadateDate',
|
||||
fields=[
|
||||
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
||||
('day', models.DateField()),
|
||||
('time', models.TimeField(blank=True, null=True)),
|
||||
('framadate', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='days_set', to='framadate.framadate')),
|
||||
],
|
||||
options={
|
||||
'ordering': ['day', 'time'],
|
||||
},
|
||||
),
|
||||
migrations.CreateModel(
|
||||
name='NameInFramadate',
|
||||
fields=[
|
||||
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
||||
('name', models.CharField(max_length=200)),
|
||||
('framadate', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='names_set', to='framadate.framadate')),
|
||||
],
|
||||
),
|
||||
migrations.CreateModel(
|
||||
name='Record',
|
||||
fields=[
|
||||
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
||||
('choice', models.IntegerField(choices=[(0, 'Unknown'), (3, 'Yes'), (2, 'No'), (1, 'Maybe')], default=0)),
|
||||
('framadateDate', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='records_set', to='framadate.framadatedate')),
|
||||
('nameInFramadate', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='records_set', to='framadate.nameinframadate')),
|
||||
],
|
||||
options={
|
||||
'ordering': ['framadateDate__day', 'framadateDate__time'],
|
||||
},
|
||||
),
|
||||
]
|
59
framadate/models.py
Normal file
59
framadate/models.py
Normal file
|
@ -0,0 +1,59 @@
|
|||
from django.db import models
|
||||
from datetime import datetime
|
||||
|
||||
# Create your models here
|
||||
class Framadate(models.Model):
|
||||
name = models.TextField()
|
||||
|
||||
"isRelevant if all dates are in the future"
|
||||
@property
|
||||
def isRelevant(self):
|
||||
for day in self.days_set.all():
|
||||
if day.day < datetime.now().date():
|
||||
return False
|
||||
return True
|
||||
|
||||
def __str__(self):
|
||||
return self.name
|
||||
|
||||
class NameInFramadate(models.Model):
|
||||
framadate = models.ForeignKey(Framadate, on_delete=models.CASCADE, related_name="names_set")
|
||||
name = models.CharField(max_length=200)
|
||||
|
||||
def __str__(self):
|
||||
return self.name + " - in - " + self.framadate.name
|
||||
|
||||
class FramadateDate(models.Model):
|
||||
framadate = models.ForeignKey(Framadate, on_delete=models.CASCADE, related_name="days_set")
|
||||
day = models.DateField()
|
||||
time = models.TimeField(null=True, blank=True)
|
||||
|
||||
def __str__(self):
|
||||
return self.day.strftime("%Y-%m-%d") + " - in- " + self.framadate.name
|
||||
|
||||
class Meta:
|
||||
ordering = ['day', 'time']
|
||||
|
||||
class Choice(models.IntegerChoices):
|
||||
UNKNOWN = 0
|
||||
YES = 3
|
||||
NO = 2
|
||||
MAYBE = 1
|
||||
|
||||
# Quirk -> name and framadateDate needs to share same Framadate...
|
||||
class Record(models.Model):
|
||||
nameInFramadate = models.ForeignKey(NameInFramadate, on_delete=models.CASCADE, related_name="records_set")
|
||||
framadateDate = models.ForeignKey(FramadateDate, on_delete=models.CASCADE, related_name="records_set")
|
||||
choice = models.IntegerField(choices=Choice.choices, default=Choice.UNKNOWN)
|
||||
|
||||
@property
|
||||
def choiceName(self):
|
||||
return Choice(self.choice).name
|
||||
|
||||
def __str__(self):
|
||||
if self.framadateDate.time:
|
||||
return self.nameInFramadate.name + " - in - " + self.framadateDate.framadate.name + " - " + self.framadateDate.day.strftime("%Y-%m-%d") + " - " + self.framadateDate.time.strftime("%H") + ":00 - " + Choice(self.choice).name
|
||||
return self.nameInFramadate.name + " - in - " + self.framadateDate.framadate.name + " - " + self.framadateDate.day.strftime("%Y-%m-%d") + " - " + Choice(self.choice).name
|
||||
|
||||
class Meta:
|
||||
ordering = ['framadateDate__day', 'framadateDate__time']
|
132
framadate/static/framadate/framadate_detail.css
Normal file
132
framadate/static/framadate/framadate_detail.css
Normal file
|
@ -0,0 +1,132 @@
|
|||
|
||||
textarea {
|
||||
font-family: "Tomorrow", serif;
|
||||
font-weight: 400;
|
||||
font-style: normal;
|
||||
font-size: 1.5em;
|
||||
padding: 0.3em 0.5em;
|
||||
}
|
||||
|
||||
.framadate-detail {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 0.8em;
|
||||
overflow-x: hidden;
|
||||
}
|
||||
|
||||
.table {
|
||||
overflow-x: auto;
|
||||
padding-bottom: 2em;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 0.3em;
|
||||
|
||||
.row {
|
||||
display: flex;
|
||||
gap: 0.3em;
|
||||
width: max-content;
|
||||
|
||||
.item {
|
||||
/* background-color: red; */
|
||||
width: 140px;
|
||||
text-align: center;
|
||||
padding: 0.8em 0;
|
||||
}
|
||||
}
|
||||
|
||||
.YES {
|
||||
background-color: green;
|
||||
}
|
||||
|
||||
.NO {
|
||||
background-color: red;
|
||||
}
|
||||
|
||||
.MAYBE {
|
||||
background-color: goldenrod;
|
||||
}
|
||||
|
||||
.UNKNOWN {
|
||||
background-color: gray;
|
||||
}
|
||||
|
||||
.radio-column {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: start;
|
||||
|
||||
label {
|
||||
width: 100%;
|
||||
padding: 0.5em 0;
|
||||
}
|
||||
|
||||
input {
|
||||
display: none;
|
||||
}
|
||||
|
||||
label:has(input:checked) {
|
||||
background-color: #2973B2;
|
||||
color: white;
|
||||
border-radius: 10px;
|
||||
}
|
||||
}
|
||||
|
||||
#name {
|
||||
font-family: "Tomorrow", serif;
|
||||
font-size: 1em;
|
||||
}
|
||||
|
||||
.submit {
|
||||
transition: box-shadow 0.2s ease;
|
||||
background-color: #2973B2;
|
||||
color: white;
|
||||
text-decoration: none;
|
||||
padding: 0.5em 1em;
|
||||
margin: 1em;
|
||||
width: min-content;
|
||||
white-space: nowrap;
|
||||
border-radius: 20px;
|
||||
box-shadow: 0 0 10px rgba(0, 0, 0, 0.5);
|
||||
border: none;
|
||||
font-size: 1.4em;
|
||||
font-family: "Tomorrow", serif;
|
||||
width: 150px;
|
||||
}
|
||||
|
||||
.delete {
|
||||
background-color: red;
|
||||
color: black;
|
||||
|
||||
}
|
||||
|
||||
.submit:hover {
|
||||
box-shadow: none;
|
||||
}
|
||||
}
|
||||
|
||||
.center {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
}
|
||||
|
||||
.mini-row .item {
|
||||
font-size: 0.8em;
|
||||
}
|
||||
|
||||
.item-with-edit {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
gap: 1em;
|
||||
|
||||
a {
|
||||
color: #2973B2;
|
||||
}
|
||||
}
|
||||
|
||||
.delete-framadate {
|
||||
font-size: 0.5em;
|
||||
margin-left: 2em;
|
||||
color: red;
|
||||
}
|
82
framadate/static/framadate/new_framadate.css
Normal file
82
framadate/static/framadate/new_framadate.css
Normal file
|
@ -0,0 +1,82 @@
|
|||
.label-name {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
gap: 2em;
|
||||
align-items: center;
|
||||
font-family: "Tomorrow", serif;
|
||||
|
||||
input {
|
||||
font-family: "Tomorrow", serif;
|
||||
font-size: 1em;
|
||||
padding: 0.5em;
|
||||
border-radius: 10px;
|
||||
text-align: center;
|
||||
border: 1px solid #606060;
|
||||
}
|
||||
}
|
||||
|
||||
.dates {
|
||||
border: 1px solid #ccc;
|
||||
padding: 1em;
|
||||
margin: 1em 0;
|
||||
border-radius: 10px;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 0.5em;
|
||||
|
||||
.date {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
gap: 2em;
|
||||
align-items: center;
|
||||
}
|
||||
}
|
||||
|
||||
input[type="date"], input[type="time"] {
|
||||
font-family: "Tomorrow", serif;
|
||||
font-size: 1em;
|
||||
padding: 0.3em 0.7em;
|
||||
border: 1px solid #606060;
|
||||
border-radius: 10px;
|
||||
margin-left: 0.5em;
|
||||
}
|
||||
|
||||
.controls {
|
||||
margin-bottom: 2em;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 0.5em;
|
||||
align-items: start;
|
||||
}
|
||||
|
||||
.add-button {
|
||||
border: none;
|
||||
background-color: #2973B2;
|
||||
color: white;
|
||||
padding: 0.4em 1em;
|
||||
font-size: 1em;
|
||||
font-family: "Tomorrow", serif;
|
||||
border-radius: 10px;
|
||||
box-shadow: 0 0 10px rgba(0, 0, 0, 0.5);
|
||||
transition: box-shadow 0.2s ease;
|
||||
margin: 0.5em;
|
||||
}
|
||||
|
||||
.add-button:hover {
|
||||
box-shadow: none;
|
||||
}
|
||||
|
||||
.span-controls {
|
||||
display: flex;
|
||||
gap: 2em;
|
||||
|
||||
label {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 1em;
|
||||
}
|
||||
}
|
||||
|
||||
.create {
|
||||
background-color: green;
|
||||
}
|
47
framadate/static/framadate/style.css
Normal file
47
framadate/static/framadate/style.css
Normal file
|
@ -0,0 +1,47 @@
|
|||
body {
|
||||
font-family: "Tomorrow", serif;
|
||||
font-weight: 400;
|
||||
font-style: normal;
|
||||
margin: 1em;
|
||||
padding: 1em;
|
||||
border: 1px solid black;
|
||||
border-radius: 20px;
|
||||
font-size: 1.2em;
|
||||
|
||||
.framadates {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 0.8em;
|
||||
|
||||
a {
|
||||
color: black;
|
||||
}
|
||||
}
|
||||
|
||||
h1 {
|
||||
margin: 0.3em 0.5em;
|
||||
}
|
||||
|
||||
.column {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: start;
|
||||
}
|
||||
|
||||
.new {
|
||||
transition: box-shadow 0.2s ease;
|
||||
background-color: #2973B2;
|
||||
color: white;
|
||||
text-decoration: none;
|
||||
padding: 0.5em 1em;
|
||||
margin: 1em 0;
|
||||
width: min-content;
|
||||
white-space: nowrap;
|
||||
border-radius: 10px;
|
||||
box-shadow: 0 0 10px rgba(0, 0, 0, 0.5);
|
||||
}
|
||||
|
||||
.new:hover {
|
||||
box-shadow: none;
|
||||
}
|
||||
}
|
98
framadate/templates/framadate/framadate_detail.html
Normal file
98
framadate/templates/framadate/framadate_detail.html
Normal file
|
@ -0,0 +1,98 @@
|
|||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
|
||||
{% load static %}
|
||||
<link rel="stylesheet" href="{% static 'framadate/style.css' %}">
|
||||
<link rel="stylesheet" href="{% static 'framadate/framadate_detail.css' %}">
|
||||
<!-- fonts -->
|
||||
<link rel="preconnect" href="https://fonts.googleapis.com">
|
||||
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
|
||||
<link href="https://fonts.googleapis.com/css2?family=Tomorrow:ital,wght@0,100;0,200;0,300;0,400;0,500;0,600;0,700;0,800;0,900;1,100;1,200;1,300;1,400;1,500;1,600;1,700;1,800;1,900&display=swap" rel="stylesheet">
|
||||
<!-- icons -->
|
||||
<link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Material+Symbols+Rounded:opsz,wght,FILL,GRAD@20..48,100..700,0..1,-50..200&icon_names=edit" />
|
||||
|
||||
<div class="framadate-detail">
|
||||
<a href="/framadate" class="back">Back</a>
|
||||
<h1>{{ framadate.name }} <a href="/framadate/{{ framadate.id }}/delete" class="delete-framadate">Delete</a></h1>
|
||||
|
||||
<form class="table" method="post" action="/framadate/{{ framadate.id }}/save-all">
|
||||
{% csrf_token %}
|
||||
<!-- hint -->
|
||||
<div class="row">
|
||||
<div class="item"></div>
|
||||
{% for mydate in framadate.days_set.all %}
|
||||
<div class="item">{{ mydate.day|date:"d.m." }} {% if mydate.time %} - {{ mydate.time|time:"H:00" }} {% endif %}</div>
|
||||
{% endfor %}
|
||||
</div>
|
||||
<!-- other users -->
|
||||
{% for name in framadate.names_set.all %}
|
||||
<div class="row">
|
||||
<div class="item item-with-edit">
|
||||
{{ name.name }}
|
||||
<a href="/framadate/{{ framadate.id }}/edit/{{ name.id }}"><span class="material-symbols-rounded">edit</span></a>
|
||||
</div>
|
||||
{% for record in name.records_set.all %}
|
||||
<div class="item {{ record.choiceName }}">{{ record.choiceName }}</div>
|
||||
{% endfor %}
|
||||
</div>
|
||||
{% endfor %}
|
||||
<!-- hint -->
|
||||
<div class="row mini-row">
|
||||
<div class="item"></div>
|
||||
{% for mydate in framadate.days_set.all %}
|
||||
<div class="item">{{ mydate.day|date:"d.m." }} {% if mydate.time %} - {{ mydate.time|time:"H:00" }} {% endif %}</div>
|
||||
{% endfor %}
|
||||
</div>
|
||||
<!-- inputs -->
|
||||
{% if edditing %}
|
||||
<div class="row">
|
||||
<div class="item center"><input type="text" class="item" name="name" id="name" value="{{ name.name }}"></div>
|
||||
{% for record in name.records_set.all %}
|
||||
<div class="item radio-column">
|
||||
<label><input type="radio" name="choice_{{ record.id }}" value="3" {% if record.choice == 3 %} checked {%endif%}>YES</label>
|
||||
<label><input type="radio" name="choice_{{ record.id }}" value="2" {% if record.choice == 2 %} checked {%endif%}>NO</label>
|
||||
<label><input type="radio" name="choice_{{ record.id }}" value="1" {% if record.choice == 1 %} checked {%endif%}>MAYBE</label>
|
||||
</div>
|
||||
{% endfor %}
|
||||
</div>
|
||||
{% else %}
|
||||
<div class="row">
|
||||
<div class="item center"><input type="text" class="item" name="name" id="name"></div>
|
||||
{% for mydate in framadate.days_set.all %}
|
||||
<div class="item radio-column">
|
||||
<label><input type="radio" name="choice_{{ mydate.id }}" value="3">YES</label>
|
||||
<label><input type="radio" name="choice_{{ mydate.id }}" value="2">NO</label>
|
||||
<label><input type="radio" name="choice_{{ mydate.id }}" value="1">MAYBE</label>
|
||||
</div>
|
||||
{% endfor %}
|
||||
</div>
|
||||
{% endif %}
|
||||
<!-- save handeling -->
|
||||
<div class="row">
|
||||
<input type="submit" class="submit" value="Save">
|
||||
{% if edditing %}
|
||||
<input name="delete" type="submit" class="submit delete" value="Delete" onclick="return confirmSubmit()">
|
||||
<input type="hidden" name="delete_id" value="{{ name.id }}">
|
||||
{% endif %}
|
||||
</div>
|
||||
<!-- best dates -->
|
||||
<h3>Best days - {{ max_count }}</h3>
|
||||
<div class="row">
|
||||
{% for mydate in best_dates %}
|
||||
<div class="item">{{ mydate.day|date:"d.m." }} {% if mydate.time %} - {{ mydate.time|time:"H:00" }} {% endif %}</div>
|
||||
{% endfor %}
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
|
||||
<script>
|
||||
function confirmSubmit() {
|
||||
return confirm("Are you sure you want delete the records?");
|
||||
}
|
||||
|
||||
// prevent .delete-framadate click event
|
||||
document.querySelector(".delete-framadate").addEventListener("click", function(event) {
|
||||
if (!confirm("Are you sure you want delete the framadate?")) {
|
||||
event.preventDefault();
|
||||
}
|
||||
});
|
||||
</script>
|
31
framadate/templates/framadate/framadate_list.html
Normal file
31
framadate/templates/framadate/framadate_list.html
Normal file
|
@ -0,0 +1,31 @@
|
|||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
|
||||
{% load static %}
|
||||
<link rel="stylesheet" href="{% static 'framadate/style.css' %}">
|
||||
<!-- fonts -->
|
||||
<link rel="preconnect" href="https://fonts.googleapis.com">
|
||||
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
|
||||
<link href="https://fonts.googleapis.com/css2?family=Tomorrow:ital,wght@0,100;0,200;0,300;0,400;0,500;0,600;0,700;0,800;0,900;1,100;1,200;1,300;1,400;1,500;1,600;1,700;1,800;1,900&display=swap" rel="stylesheet">
|
||||
|
||||
<div class="column">
|
||||
<h1>All current framadates</h1>
|
||||
<div class="framadates">
|
||||
{% for framadate in object_list %}
|
||||
{% if framadate.isRelevant %}
|
||||
<a href="framadate/{{ framadate.id }}">{{ framadate.name }}</a>
|
||||
{% endif %}
|
||||
{% endfor %}
|
||||
</div>
|
||||
<a href="/framadate/new" class="new">Create new</a>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<h1>Past framadates</h1>
|
||||
<div class="framadates">
|
||||
{% for framadate in object_list %}
|
||||
{% if not framadate.isRelevant %}
|
||||
<a href="framadate/{{ framadate.id }}">{{ framadate.name }}</a>
|
||||
{% endif %}
|
||||
{% endfor %}
|
||||
</div>
|
||||
</div>
|
82
framadate/templates/framadate/new_framadate.html
Normal file
82
framadate/templates/framadate/new_framadate.html
Normal file
|
@ -0,0 +1,82 @@
|
|||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
|
||||
{% load static %}
|
||||
<link rel="stylesheet" href="{% static 'framadate/style.css' %}">
|
||||
<link rel="stylesheet" href="{% static 'framadate/new_framadate.css' %}">
|
||||
<!-- fonts -->
|
||||
<link rel="preconnect" href="https://fonts.googleapis.com">
|
||||
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
|
||||
<link href="https://fonts.googleapis.com/css2?family=Tomorrow:ital,wght@0,100;0,200;0,300;0,400;0,500;0,600;0,700;0,800;0,900;1,100;1,200;1,300;1,400;1,500;1,600;1,700;1,800;1,900&display=swap" rel="stylesheet">
|
||||
|
||||
<a href="/framadate" class="back">Back</a>
|
||||
<h1>New framadate</h1>
|
||||
|
||||
<form action="/framadate/new" method="post">
|
||||
{% csrf_token %}
|
||||
<label class="label-name">name: <input type="text" required name="name"></label>
|
||||
|
||||
<div class="dates">
|
||||
<!-- <div id="date_1" class="date">
|
||||
<label>date: <input type="date" name="" id="" required></label>
|
||||
<label>time (optional, if empty -> entire day ): <input type="time" name="" id="" step="3600000"></label>
|
||||
<button type="button" onclick="removeDate(1)">remove</button>
|
||||
</div> -->
|
||||
</div>
|
||||
<!-- controls -->
|
||||
<div class="controls">
|
||||
<button type="button" class="add-button" onclick="addDate()">Add date</button>
|
||||
<div class="span-controls">
|
||||
<label>from: <input id="from" type="date"></label>
|
||||
<label>to: <input id="to" type="date"></label>
|
||||
<button type="button" onclick="addSpan()" class="add-button">Add span</button>
|
||||
</div>
|
||||
</div>
|
||||
<input type="submit" value="Create" class="add-button create">
|
||||
</form>
|
||||
|
||||
|
||||
<script>
|
||||
numberOfDates = 1;
|
||||
|
||||
function addDate() {
|
||||
let newDate = document.createElement("div");
|
||||
newDate.classList.add("date");
|
||||
numberOfDates++;
|
||||
newDate.id = "date_" + numberOfDates;
|
||||
// step does not work in safari...
|
||||
newDate.innerHTML = `
|
||||
<label>date: <input type="date" name="date" required></label>
|
||||
<label>time (optional, if empty -> entire day ): <input type="time" name="time" step="3600"></label>
|
||||
<button type="button" onclick="removeDate(`+numberOfDates+`)">remove</button>
|
||||
`;
|
||||
dates = document.querySelector(".dates");
|
||||
dates.appendChild(newDate);
|
||||
}
|
||||
|
||||
function removeDate(id_to_remove) {
|
||||
document.getElementById("date_" + id_to_remove).remove();
|
||||
}
|
||||
|
||||
let from = document.getElementById("from");
|
||||
let to = document.getElementById("to");
|
||||
function addSpan() {
|
||||
let fromDate = new Date(from.value);
|
||||
let toDate = new Date(to.value);
|
||||
// print date of every date in range
|
||||
while (fromDate <= toDate) {
|
||||
let newDate = document.createElement("div");
|
||||
newDate.classList.add("date");
|
||||
numberOfDates++;
|
||||
newDate.id = "date_" + numberOfDates;
|
||||
newDate.innerHTML = `
|
||||
<label>date: <input type="date" name="date" required value="`+fromDate.toISOString().split("T")[0]+`"></label>
|
||||
<label>time (optional, if empty -> entire day ): <input type="time" name="time" step="3600"></label>
|
||||
<button type="button" onclick="removeDate(`+numberOfDates+`)">remove</button>
|
||||
`;
|
||||
dates = document.querySelector(".dates");
|
||||
dates.appendChild(newDate);
|
||||
fromDate.setDate(fromDate.getDate() + 1);
|
||||
}
|
||||
|
||||
}
|
||||
</script>
|
3
framadate/tests.py
Normal file
3
framadate/tests.py
Normal file
|
@ -0,0 +1,3 @@
|
|||
from django.test import TestCase
|
||||
|
||||
# Create your tests here.
|
11
framadate/urls.py
Normal file
11
framadate/urls.py
Normal file
|
@ -0,0 +1,11 @@
|
|||
from django.urls import path
|
||||
from . import views
|
||||
|
||||
urlpatterns = [
|
||||
path("framadate", views.FramadateListView.as_view(), name="framadate_list"),
|
||||
path("framadate/new", views.NewFramadate.as_view(), name="new_framadate"),
|
||||
path("framadate/<int:pk>", views.FramadateDetail.as_view(), name="framadate_detail"),
|
||||
path("framadate/<int:pk>/edit/<int:name_id>", views.FramadateDetailEdit.as_view(), name="framadate_detail_edit"),
|
||||
path("framadate/<int:pk>/save-all", views.save_all, name="save_all"),
|
||||
path("framadate/<int:pk>/delete", views.delete_framadate, name="delete"),
|
||||
]
|
93
framadate/views.py
Normal file
93
framadate/views.py
Normal file
|
@ -0,0 +1,93 @@
|
|||
from django.http import HttpResponse, HttpResponseRedirect
|
||||
from django.urls import reverse
|
||||
from django.views.generic.list import ListView
|
||||
from django.views.generic import TemplateView
|
||||
from .models import *
|
||||
|
||||
class FramadateListView(ListView):
|
||||
model = Framadate
|
||||
template_name = 'framadate/framadate_list.html'
|
||||
|
||||
class NewFramadate(TemplateView):
|
||||
template_name = 'framadate/new_framadate.html'
|
||||
|
||||
def post(self, request, *args, **kwargs):
|
||||
new_framadate = Framadate.objects.create(name=request.POST['name'])
|
||||
dates = request.POST.getlist('date')
|
||||
times = request.POST.getlist('time')
|
||||
for i in range(len(dates)):
|
||||
FramadateDate.objects.create(framadate=new_framadate, day=dates[i], time=(times[i] if times[i] else None))
|
||||
return HttpResponseRedirect("/framadate/" + str(new_framadate.id))
|
||||
|
||||
class FramadateDetail(TemplateView):
|
||||
template_name = 'framadate/framadate_detail.html'
|
||||
|
||||
def get_context_data(self, **kwargs):
|
||||
context = super().get_context_data(**kwargs)
|
||||
addContextForFramadate(context, **kwargs)
|
||||
return context
|
||||
|
||||
class FramadateDetailEdit(TemplateView):
|
||||
template_name = 'framadate/framadate_detail.html'
|
||||
|
||||
def get_context_data(self, **kwargs):
|
||||
context = super().get_context_data(**kwargs)
|
||||
addContextForFramadate(context, **kwargs)
|
||||
# data to edit
|
||||
context["edditing"] = True
|
||||
context["name"] = NameInFramadate.objects.get(pk=kwargs['name_id'])
|
||||
return context
|
||||
|
||||
def save_all(request, pk):
|
||||
if request.method != "POST":
|
||||
return HttpResponse("Not a POST request")
|
||||
if request.POST.get("name") == "":
|
||||
return HttpResponseRedirect(reverse('framadate_detail', args=[pk]))
|
||||
framadate = Framadate.objects.get(pk=pk)
|
||||
# deleting
|
||||
if request.POST.get("delete"):
|
||||
try:
|
||||
NameInFramadate.objects.get(pk=request.POST['delete_id']).delete()
|
||||
except:
|
||||
return HttpResponse("Ups something went wrong, can't delete")
|
||||
return HttpResponseRedirect(reverse('framadate_detail', args=[pk]))
|
||||
# new
|
||||
if not request.POST.get("delete_id"):
|
||||
new_name = NameInFramadate.objects.create(framadate=framadate, name=request.POST['name'])
|
||||
for day in framadate.days_set.all():
|
||||
Record.objects.create(nameInFramadate=new_name, framadateDate=day, choice=(request.POST["choice_" + str(day.id)] if request.POST.get("choice_" + str(day.id)) else 0))
|
||||
else: # edditing
|
||||
name_id = request.POST['delete_id']
|
||||
name = NameInFramadate.objects.get(pk=name_id)
|
||||
name.name = request.POST['name']
|
||||
name.save()
|
||||
for record in name.records_set.all():
|
||||
|
||||
record.choice = (request.POST["choice_" + str(record.id)] if request.POST.get("choice_" + str(record.id)) else 0)
|
||||
record.save()
|
||||
return HttpResponseRedirect(reverse('framadate_detail', args=[pk]))
|
||||
|
||||
def delete_framadate(request, pk):
|
||||
framadate = Framadate.objects.get(pk=pk)
|
||||
framadate.delete()
|
||||
return HttpResponseRedirect("/framadate")
|
||||
|
||||
def addContextForFramadate(context, **kwargs):
|
||||
context['framadate'] = Framadate.objects.get(pk=kwargs['pk'])
|
||||
context['choices'] = Choice.choices
|
||||
context['best_dates'] = []
|
||||
best_dates = []
|
||||
best = -1
|
||||
for day in context['framadate'].days_set.all(): # kinda slow?
|
||||
count = 0
|
||||
for record in day.records_set.all():
|
||||
if record.choice == 3:
|
||||
count += 1
|
||||
if count > best:
|
||||
best_dates = [day]
|
||||
best = count
|
||||
elif count == best:
|
||||
best_dates.append(day)
|
||||
context['best_dates'] = best_dates
|
||||
context['max_count'] = best
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
from django.contrib import admin
|
||||
from reversion.admin import VersionAdmin
|
||||
from korektury.models import KorekturovanePDF, Oprava, KorekturaTag
|
||||
from korektury.models import KorekturovanePDF
|
||||
|
||||
from django.core.mail import EmailMessage
|
||||
from django.urls import reverse
|
||||
|
@ -62,11 +62,3 @@ Korekturovátko
|
|||
).send()
|
||||
|
||||
admin.site.register(KorekturovanePDF, KorekturovanePDFAdmin)
|
||||
|
||||
|
||||
class OpravaAdmin(admin.ModelAdmin):
|
||||
model = Oprava
|
||||
filter_horizontal = ("informovani_orgove", "tagy",)
|
||||
|
||||
admin.site.register(Oprava, OpravaAdmin)
|
||||
admin.site.register(KorekturaTag)
|
||||
|
|
|
@ -1,7 +0,0 @@
|
|||
from django.apps import AppConfig
|
||||
|
||||
|
||||
class ApiConfig(AppConfig):
|
||||
default_auto_field = 'django.db.models.BigAutoField'
|
||||
name = 'korektury.api'
|
||||
label = 'korektury_api' # Protože jedno api už máme.
|
|
@ -1,9 +0,0 @@
|
|||
from django.urls import path
|
||||
from personalni.utils import org_required
|
||||
from . import views
|
||||
|
||||
urlpatterns = [
|
||||
path('<int:pdf_id>/stav', org_required(views.korektury_stav_view), name='korektury_api_pdf_stav'),
|
||||
path('oprava/stav', org_required(views.oprava_stav_view), name='korektury_api_oprava_stav'),
|
||||
path('<int:pdf_id>/opravy_a_komentare', org_required(views.opravy_a_komentare_view), name='korektury_api_opravy_a_komentare'),
|
||||
]
|
|
@ -1,109 +0,0 @@
|
|||
from django.http import HttpResponseForbidden, JsonResponse
|
||||
from django.shortcuts import get_object_or_404
|
||||
from django.utils.html import linebreaks
|
||||
from django.views.decorators.csrf import csrf_exempt
|
||||
|
||||
from rest_framework import serializers
|
||||
|
||||
from korektury.utils import send_email_notification_komentar
|
||||
from korektury.models import Oprava, KorekturovanePDF, Komentar, KorekturaTag
|
||||
from personalni.models import Organizator, Osoba
|
||||
|
||||
|
||||
def korektury_stav_view(request, pdf_id: int, **kwargs):
|
||||
q = request.POST
|
||||
pdf = get_object_or_404(KorekturovanePDF, id=pdf_id)
|
||||
status = q.get('state')
|
||||
if status is not None:
|
||||
assert status in KorekturovanePDF.STATUS.values
|
||||
pdf.status = status
|
||||
pdf.save()
|
||||
return JsonResponse({'status': pdf.status})
|
||||
|
||||
|
||||
def oprava_stav_view(request, **kwargs):
|
||||
q = request.POST
|
||||
op_id_str = q.get('id')
|
||||
assert op_id_str is not None
|
||||
op_id = int(op_id_str)
|
||||
op = get_object_or_404(Oprava, id=op_id)
|
||||
status = q.get('action')
|
||||
if status is not None:
|
||||
assert status in Oprava.STATUS.values
|
||||
op.status = status
|
||||
op.save()
|
||||
return JsonResponse({'status': op.status})
|
||||
|
||||
class KomentarSerializer(serializers.ModelSerializer):
|
||||
class Meta:
|
||||
model = Komentar
|
||||
fields = '__all__'
|
||||
|
||||
def to_representation(self, instance):
|
||||
ret = super().to_representation(instance)
|
||||
ret["autor"] = str(instance.autor)
|
||||
ret["text"] = linebreaks(ret["text"], autoescape=True) # Autora není třeba escapovat, ten se vkládá jako text.
|
||||
return ret
|
||||
|
||||
class KorekturaTagSerializer(serializers.ModelSerializer):
|
||||
class Meta:
|
||||
model = KorekturaTag
|
||||
fields = '__all__'
|
||||
|
||||
|
||||
class OpravaSerializer(serializers.ModelSerializer):
|
||||
class Meta:
|
||||
model = Oprava
|
||||
fields = '__all__'
|
||||
|
||||
def to_representation(self, instance):
|
||||
ret = super().to_representation(instance)
|
||||
ret["komentare"] = [KomentarSerializer(komentar).data for komentar in instance.komentar_set.all()]
|
||||
ret["tagy"] = [KorekturaTagSerializer(tag).data for tag in instance.tagy.all()]
|
||||
return ret
|
||||
|
||||
# komentar_set = serializers.ListField(child=KomentarSerializer())
|
||||
|
||||
def opravy_a_komentare_view(request, pdf_id: int, **kwargs):
|
||||
if request.method == 'POST':
|
||||
q = request.POST
|
||||
|
||||
x = int(q.get('x'))
|
||||
y = int(q.get('y'))
|
||||
img_id = int(q.get('img_id'))
|
||||
oprava_id = int(q.get('oprava_id'))
|
||||
komentar_id = int(q.get('komentar_id'))
|
||||
text = q.get('text')
|
||||
|
||||
# prirazeni autora podle prihlaseni
|
||||
autor_user = request.user
|
||||
# pokud existuje ucet (user), ale neni to organizator = 403
|
||||
autor = Organizator.objects.filter(osoba__user=autor_user).first()
|
||||
|
||||
if komentar_id != -1:
|
||||
komentar = get_object_or_404(Komentar, id=komentar_id)
|
||||
komentar.text = text
|
||||
komentar.autor = autor
|
||||
komentar.save()
|
||||
else:
|
||||
if oprava_id != -1:
|
||||
oprava = get_object_or_404(Oprava, id=oprava_id)
|
||||
else:
|
||||
pdf = get_object_or_404(KorekturovanePDF, id=pdf_id)
|
||||
oprava = Oprava.objects.create(
|
||||
pdf=pdf,
|
||||
strana=img_id,
|
||||
x=x,
|
||||
y=y,
|
||||
)
|
||||
|
||||
tagy_raw = q.get('tagy')
|
||||
if tagy_raw != "":
|
||||
tagy = list(map(int, tagy_raw.split(",")))
|
||||
oprava.tagy.add(*KorekturaTag.objects.filter(id__in=tagy))
|
||||
Komentar.objects.create(oprava=oprava, autor=autor, text=text)
|
||||
|
||||
|
||||
opravy = Oprava.objects.filter(pdf=pdf_id).all()
|
||||
# Serializovat list je prý security vulnerability, tedy je přidán slovník pro bezpečnost
|
||||
return JsonResponse({"context": [OpravaSerializer(oprava).data for oprava in opravy]})
|
14
korektury/forms.py
Normal file
14
korektury/forms.py
Normal file
|
@ -0,0 +1,14 @@
|
|||
from django import forms
|
||||
|
||||
class OpravaForm(forms.Form):
|
||||
""" formulář k přidání opravy (:class:`korektury.models.Oprava`) """
|
||||
text = forms.CharField(max_length=256)
|
||||
autor = forms.CharField(max_length=20)
|
||||
x = forms.IntegerField()
|
||||
y = forms.IntegerField()
|
||||
scroll = forms.CharField(max_length=256)
|
||||
pdf = forms.CharField(max_length=256)
|
||||
img_id = forms.CharField(max_length=256)
|
||||
id = forms.CharField(max_length=256)
|
||||
action = forms.CharField(max_length=256)
|
||||
|
|
@ -1,45 +0,0 @@
|
|||
# Generated by Django 4.2.16 on 2024-12-12 10:25
|
||||
|
||||
from django.db import migrations
|
||||
|
||||
import datetime
|
||||
from django.utils import timezone
|
||||
|
||||
|
||||
def oprava2komentar(apps, schema_editor):
|
||||
Oprava = apps.get_model('korektury', 'Oprava')
|
||||
Komentar = apps.get_model('korektury', 'Komentar')
|
||||
|
||||
for o in Oprava.objects.all():
|
||||
Komentar.objects.create(oprava=o, text=o.text, autor=o.autor, cas=timezone.make_aware(datetime.datetime.fromtimestamp(0)))
|
||||
|
||||
def komentar2oprava(apps, schema_editor):
|
||||
Oprava = apps.get_model('korektury', 'Oprava')
|
||||
Komentar = apps.get_model('korektury', 'Komentar')
|
||||
|
||||
for o in Oprava.objects.all():
|
||||
k = Komentar.objects.filter(oprava=o).first()
|
||||
o.text = k.text
|
||||
o.autor = k.autor
|
||||
o.save()
|
||||
k.delete()
|
||||
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('korektury', '0024_vic_orgu_k_pdf'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.RunPython(oprava2komentar, komentar2oprava),
|
||||
migrations.RemoveField(
|
||||
model_name='oprava',
|
||||
name='autor',
|
||||
),
|
||||
migrations.RemoveField(
|
||||
model_name='oprava',
|
||||
name='text',
|
||||
),
|
||||
]
|
|
@ -1,29 +0,0 @@
|
|||
# Generated by Django 4.2.16 on 2025-02-11 14:28
|
||||
|
||||
from django.db import migrations, models
|
||||
|
||||
def pridani_orgu(apps, _schema_editor):
|
||||
Komentar = apps.get_model('korektury','Komentar')
|
||||
for komentar in Komentar.objects.all():
|
||||
org = komentar.autor
|
||||
if org is not None:
|
||||
# Tohle jde asi udělat lépe než .all(…). Ale nejhorší na tom je, že .add(…) funguje jinak tady v migracích.
|
||||
if org not in komentar.oprava.informovani_orgove.all():
|
||||
komentar.oprava.informovani_orgove.add(org)
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('personalni', '0019_rename_upozorneni_resitel_upozornovat_na_opravy_reseni'),
|
||||
('korektury', '0025_remove_oprava_autor_remove_oprava_text'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AddField(
|
||||
model_name='oprava',
|
||||
name='informovani_orgove',
|
||||
field=models.ManyToManyField(blank=True, default=None, help_text='Orgové informovaní při přidání komentáře ke korektuře', related_name='informovan_o_opravach', to='personalni.organizator', verbose_name='Informovaní organizátoři'),
|
||||
),
|
||||
migrations.RunPython(pridani_orgu, migrations.RunPython.noop),
|
||||
]
|
|
@ -1,27 +0,0 @@
|
|||
# Generated by Django 4.2.16 on 2025-02-11 16:07
|
||||
|
||||
import colorfield.fields
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('korektury', '0026_oprava_informovani_orgove'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.CreateModel(
|
||||
name='KorekturaTag',
|
||||
fields=[
|
||||
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
||||
('nazev', models.CharField(help_text='Název daného tagu, <20 znaků', max_length=20, verbose_name='název tagu')),
|
||||
('barva', colorfield.fields.ColorField(default='#FFFFFF', image_field=None, max_length=25, samples=None, verbose_name='barva daného tagu')),
|
||||
],
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name='oprava',
|
||||
name='tagy',
|
||||
field=models.ManyToManyField(blank=True, default=None, to='korektury.korekturatag'),
|
||||
),
|
||||
]
|
|
@ -1,7 +1,4 @@
|
|||
import os
|
||||
|
||||
from colorfield.fields import ColorField
|
||||
|
||||
from django.db import models
|
||||
from django.urls import reverse
|
||||
from django.utils import timezone
|
||||
|
@ -55,13 +52,16 @@ class KorekturovanePDF(models.Model):
|
|||
|
||||
stran = models.IntegerField(u'počet stran', help_text='Počet stran PDF',
|
||||
default=0)
|
||||
|
||||
class STATUS(models.TextChoices):
|
||||
PRIDAVANI = 'pridavani', 'Přidávání korektur'
|
||||
ZANASENI = 'zanaseni', 'Korektury jsou zanášeny'
|
||||
ZASTARALE = 'zastarale', 'Stará verze, nekorigovat'
|
||||
|
||||
status = models.CharField(u'stav PDF',max_length=16, choices=STATUS.choices, blank=False, default = STATUS.PRIDAVANI)
|
||||
STATUS_PRIDAVANI = 'pridavani'
|
||||
STATUS_ZANASENI = 'zanaseni'
|
||||
STATUS_ZASTARALE = 'zastarale'
|
||||
STATUS_CHOICES = (
|
||||
(STATUS_PRIDAVANI, u'Přidávání korektur'),
|
||||
(STATUS_ZANASENI, u'Korektury jsou zanášeny'),
|
||||
(STATUS_ZASTARALE, u'Stará verze, nekorigovat'),
|
||||
)
|
||||
status = models.CharField(u'stav PDF',max_length=16, choices=STATUS_CHOICES, blank=False,
|
||||
default = STATUS_PRIDAVANI)
|
||||
|
||||
poslat_mail = models.BooleanField('Poslat mail o novém PDF', default=True,
|
||||
help_text='Určuje, zda se má o nově nahraném PDF poslat e-mail do mam-org. Při upravování existujícího souboru už nemá žádný vliv.',
|
||||
|
@ -134,14 +134,6 @@ class KorekturovanePDF(models.Model):
|
|||
return reverse('korektury', kwargs={'pdf': self.id})
|
||||
|
||||
|
||||
class KorekturaTag(models.Model):
|
||||
nazev = models.CharField("název tagu", blank = False, max_length=20, help_text="Název daného tagu, <20 znaků")
|
||||
barva = ColorField("barva daného tagu", default="#FFFFFF")
|
||||
|
||||
def __str__(self):
|
||||
return self.nazev
|
||||
|
||||
|
||||
@reversion.register(ignore_duplicates=True)
|
||||
class Oprava(models.Model):
|
||||
class Meta:
|
||||
|
@ -160,22 +152,32 @@ class Oprava(models.Model):
|
|||
x = models.IntegerField(u'x-ová souřadnice bugu')
|
||||
y = models.IntegerField(u'y-ová souřadnice bugu')
|
||||
|
||||
class STATUS(models.TextChoices):
|
||||
K_OPRAVE = 'k_oprave', 'K opravě'
|
||||
OPRAVENO = 'opraveno', 'Opraveno'
|
||||
NENI_CHYBA = 'neni_chyba', 'Není chyba'
|
||||
K_ZANESENI = 'k_zaneseni', 'K zanesení do TeXu'
|
||||
|
||||
status = models.CharField(u'stav opravy',max_length=16, choices=STATUS.choices, blank=False, default = STATUS.K_OPRAVE)
|
||||
|
||||
informovani_orgove = models.ManyToManyField(
|
||||
Organizator, blank=True, default=None,
|
||||
verbose_name='Informovaní organizátoři',
|
||||
help_text="Orgové informovaní při přidání komentáře ke korektuře",
|
||||
related_name='informovan_o_opravach',
|
||||
STATUS_K_OPRAVE = 'k_oprave'
|
||||
STATUS_OPRAVENO = 'opraveno'
|
||||
STATUS_NENI_CHYBA = 'neni_chyba'
|
||||
STATUS_K_ZANESENI = 'k_zaneseni'
|
||||
STATUS_CHOICES = (
|
||||
(STATUS_K_OPRAVE, u'K opravě'),
|
||||
(STATUS_OPRAVENO, u'Opraveno'),
|
||||
(STATUS_NENI_CHYBA, u'Není chyba'),
|
||||
(STATUS_K_ZANESENI, u'K zanesení do TeXu'),
|
||||
)
|
||||
status = models.CharField(u'stav opravy',max_length=16, choices=STATUS_CHOICES, blank=False,
|
||||
default = STATUS_K_OPRAVE)
|
||||
|
||||
autor = models.ForeignKey(Organizator, blank = True,
|
||||
help_text='Autor opravy',
|
||||
null = True, on_delete=models.SET_NULL)
|
||||
|
||||
text = models.TextField(u'text opravy',blank = True, help_text='Text opravy')
|
||||
|
||||
# def __init__(self,dictionary):
|
||||
# for k,v in dictionary.items():
|
||||
# setattr(self,k,v)
|
||||
|
||||
def __str__(self):
|
||||
return '{} od {}: {}'.format(self.status,self.autor,self.text)
|
||||
|
||||
tagy = models.ManyToManyField(KorekturaTag, blank=True, default=None,)
|
||||
|
||||
|
||||
@reversion.register(ignore_duplicates=True)
|
||||
|
@ -201,7 +203,5 @@ class Komentar(models.Model):
|
|||
def __str__(self):
|
||||
return '{} od {}: {}'.format(self.cas,self.autor,self.text)
|
||||
|
||||
def save(self, *args, **kwargs):
|
||||
super().save(*args, **kwargs)
|
||||
if self.autor is not None:
|
||||
self.oprava.informovani_orgove.add(self.autor)
|
||||
|
||||
|
||||
|
|
Binary file not shown.
Before ![]() (image error) Size: 307 B After ![]() (image error) Size: 270 B ![]() ![]() |
|
@ -1,130 +1,128 @@
|
|||
.textzanaseni { display:none; }
|
||||
.textzastarale { display:none; }
|
||||
#prekomentar, #preoprava, #prepointer { display: none; }
|
||||
|
||||
body {
|
||||
&[data-status="pridavani"] {
|
||||
body,
|
||||
.adding{
|
||||
background: #f3f3f3;
|
||||
color: black;
|
||||
}
|
||||
|
||||
&[data-status="zanaseni"] {
|
||||
.comitting
|
||||
{
|
||||
background: yellow;
|
||||
|
||||
.textzanaseni { display: unset; }
|
||||
}
|
||||
|
||||
&[data-status="zastarale"] {
|
||||
.deprecated {
|
||||
background: red;
|
||||
|
||||
.textzastarale { display: unset; }
|
||||
}
|
||||
}
|
||||
|
||||
img{background:white;}
|
||||
|
||||
/* Barvy korektur */
|
||||
[data-opravastatus="k_oprave"] {
|
||||
.k_oprave {
|
||||
--rgb: 255, 0, 0;
|
||||
|
||||
[value="k_oprave"] { display: none }
|
||||
.komentovat_disabled { display: none }
|
||||
}
|
||||
[data-opravastatus="opraveno"] {
|
||||
.opraveno {
|
||||
--rgb: 0, 0, 255;
|
||||
|
||||
[value="opraveno"] { display: none }
|
||||
.komentovat { display: none }
|
||||
}
|
||||
[data-opravastatus="neni_chyba"] {
|
||||
.neni_chyba {
|
||||
--rgb: 128, 128, 128;
|
||||
|
||||
[value="neni_chyba"] { display: none }
|
||||
.komentovat { display: none }
|
||||
}
|
||||
[data-opravastatus="k_zaneseni"] {
|
||||
.k_zaneseni {
|
||||
--rgb: 0, 255, 0;
|
||||
|
||||
[value="k_zaneseni"] { display: none }
|
||||
.komentovat { display: none }
|
||||
}
|
||||
|
||||
/* Skrývání korektur */
|
||||
[data-opravazobrazit="false"] {
|
||||
.corr-body { display: none; }
|
||||
.corr-buttons { display: none; }
|
||||
.toggle-button { transform: rotate(180deg); }
|
||||
}
|
||||
|
||||
/* Tlačítko na aktualizaci */
|
||||
|
||||
#korektury-aktualizace {
|
||||
position: absolute;
|
||||
right: 10px;
|
||||
top: 10px;
|
||||
|
||||
border-radius: 10px;
|
||||
|
||||
|
||||
/* copy-paste .button */
|
||||
margin: 10px 0 10px 0;
|
||||
padding: 4px 0; /*vertikální centování textu*/
|
||||
text-align: center;
|
||||
background-color: #e84e10;
|
||||
color: #fffbf6;
|
||||
font-size: 150%;
|
||||
font-weight: bold;
|
||||
font-variant: small-caps;
|
||||
filter: drop-shadow(0px 5px 5px rgba(0, 0, 0, 0.4));
|
||||
|
||||
&:hover {
|
||||
background-color: #df490e;
|
||||
}
|
||||
}
|
||||
|
||||
/* Čára od textu k místu korektury */
|
||||
.pointer-hi,
|
||||
.pointer{
|
||||
position:absolute;
|
||||
border-bottom-left-radius: 10px;
|
||||
border-left: 1px solid rgb(var(--rgb),var(--alpha));
|
||||
border-bottom: 1px solid rgb(var(--rgb),var(--alpha));
|
||||
pointer-events: none;
|
||||
/*border-bottom-left-radius: 10px; */
|
||||
border-left: 2px solid yellow;
|
||||
border-bottom: 2px solid yellow;
|
||||
border-color: rgb(var(--rgb),var(--alpha));
|
||||
}
|
||||
|
||||
.pointer {
|
||||
border-width: 1px;
|
||||
--alpha: 0.35;
|
||||
}
|
||||
|
||||
/* Zvýraznění čáry při najetí na korekturu */
|
||||
&[data-highlight="true"] {
|
||||
.pointer-hi {
|
||||
border-width: 3px;
|
||||
--alpha: 1;
|
||||
}
|
||||
}
|
||||
|
||||
/* Korektura samotná */
|
||||
.oprava {
|
||||
|
||||
|
||||
.box:hover{
|
||||
border-width:3px;
|
||||
margin: 0px;
|
||||
}
|
||||
.box {
|
||||
margin: 1px;
|
||||
background-color: white;
|
||||
width:300px;
|
||||
/*position:absolute;*/
|
||||
padding: 3px;
|
||||
border: 2px solid rgb(var(--rgb));
|
||||
border: 2px solid black;
|
||||
border-radius: 10px;
|
||||
position: absolute;
|
||||
|
||||
&:hover {
|
||||
border-width:3px;
|
||||
margin: 0;
|
||||
border-color: rgb(var(--rgb));
|
||||
}
|
||||
form {
|
||||
display:inline;
|
||||
}
|
||||
|
||||
button, img {
|
||||
.float-right{
|
||||
float:right;
|
||||
}
|
||||
|
||||
.imgdiv {
|
||||
position:relative;
|
||||
left:0px;
|
||||
top:0px;
|
||||
}
|
||||
#commform-div {
|
||||
display: none;
|
||||
position: absolute;
|
||||
background-color: white;
|
||||
border: 1px solid;
|
||||
padding: 3px;
|
||||
/*
|
||||
width: 310;
|
||||
height: 220;
|
||||
*/
|
||||
z-index: 10;
|
||||
border: 4px solid red;
|
||||
border-radius: 10px;
|
||||
background-color: white;
|
||||
opacity: 80%;
|
||||
}
|
||||
.close-button{
|
||||
background-color: yellow;
|
||||
}
|
||||
|
||||
|
||||
.box button,
|
||||
.box img,
|
||||
.box-done button,
|
||||
.box-done img,
|
||||
.box-ready button,
|
||||
.box-ready img,
|
||||
.box-wontfix button,
|
||||
.box-wontfix img{
|
||||
border: 1px solid white;
|
||||
background-color:transparent;
|
||||
margin:0;
|
||||
padding: 1px;
|
||||
|
||||
&:hover {
|
||||
}
|
||||
.box button:hover,
|
||||
.box img:hover,
|
||||
.box-done img:hover,
|
||||
.box-done button:hover,
|
||||
.box-ready img:hover,
|
||||
.box-ready button:hover,
|
||||
.box-wontfix img:hover,
|
||||
.box-wontfix button:hover{
|
||||
border: 1px solid black;
|
||||
}
|
||||
}
|
||||
|
||||
button img { pointer-events: none; }
|
||||
.comment hr {
|
||||
height: 0px;
|
||||
}
|
||||
|
||||
.corr-header {
|
||||
overflow: auto;
|
||||
|
@ -136,92 +134,3 @@ img{background:white;}
|
|||
margin-top: 3px;
|
||||
}
|
||||
|
||||
.float-right{
|
||||
float:right;
|
||||
}
|
||||
}
|
||||
|
||||
form {
|
||||
display:inline;
|
||||
}
|
||||
|
||||
/* Zobrazované PDF */
|
||||
.imgdiv {
|
||||
position:relative;
|
||||
left:0;
|
||||
top:0;
|
||||
}
|
||||
|
||||
/* Přidávání korektury / úprava komentáře */
|
||||
#commform-div {
|
||||
position: absolute;
|
||||
background-color: white;
|
||||
padding: 3px;
|
||||
z-index: 10;
|
||||
border: 4px solid red;
|
||||
border-radius: 10px;
|
||||
opacity: 80%;
|
||||
}
|
||||
|
||||
.korektury-tag {
|
||||
border-radius: 5px;
|
||||
margin: 2px;
|
||||
padding: 2px;
|
||||
|
||||
&[data-selected="false"] { opacity: 0.7; }
|
||||
}
|
||||
|
||||
/* Šipky na posouvání korektur */
|
||||
#korektury-sipky {
|
||||
position: fixed;
|
||||
bottom: 5px;
|
||||
left: 5px;
|
||||
|
||||
button, img {
|
||||
border: 1px solid white;
|
||||
background-color:transparent;
|
||||
margin:0;
|
||||
padding: 1px;
|
||||
|
||||
border-radius: 5px;
|
||||
|
||||
&:hover {
|
||||
border: 1px solid black;
|
||||
}
|
||||
}
|
||||
|
||||
button img { pointer-events: none; }
|
||||
|
||||
#predchozi-korektura, #dalsi-korektura {
|
||||
background-color: #EEEEEE;
|
||||
}
|
||||
|
||||
#predchozi-korektura-k-oprave, #dalsi-korektura-k-oprave {
|
||||
background-color: #FF0000;
|
||||
}
|
||||
|
||||
#predchozi-korektura-k-zaneseni, #dalsi-korektura-k-zaneseni {
|
||||
background-color: #00FF00;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**** ROZLIŠENÍ MEZI LOKÁLNÍM, TESTOVACÍM A PRODUKČNÍM WEBEM ****/
|
||||
body.localweb, body.testweb, body.suprodweb {
|
||||
&:before, &:after {
|
||||
content: "";
|
||||
position: fixed;
|
||||
width: 20px;
|
||||
height: 100%;
|
||||
top: 0;
|
||||
z-index: -1000;
|
||||
}
|
||||
|
||||
&:before { left: 0; }
|
||||
&:after { right: 0; }
|
||||
}
|
||||
|
||||
body.localweb { &:before, &:after { background: greenyellow; } }
|
||||
body.testweb { &:before, &:after { background: darkorange; } }
|
||||
body.suprodweb { &:before, &:after { background: red; } }
|
||||
/****************************************************************/
|
||||
|
|
|
@ -1,46 +1,283 @@
|
|||
const W_SKIP = 10;
|
||||
const H_SKIP = 5;
|
||||
const POINTER_MIN_H = 30;
|
||||
|
||||
function place_comments_one_div(img_id, comments)
|
||||
{
|
||||
const img = document.getElementById("img-"+img_id);
|
||||
if( img == null ) return;
|
||||
const comments_sorted = comments.sort((a, b) => a.y - b.y);
|
||||
var img = document.getElementById(img_id);
|
||||
if( img == null ) {
|
||||
return;
|
||||
}
|
||||
var par = img.parentNode;
|
||||
var w = img.clientWidth;
|
||||
var h = img.clientHeight;
|
||||
var w_skip = 10;
|
||||
var h_skip = 5;
|
||||
var pointer_min_h = 30;
|
||||
|
||||
const par = img.parentNode;
|
||||
const w = img.clientWidth;
|
||||
|
||||
let bott_max = 0;
|
||||
for (const oprava of comments_sorted) {
|
||||
const x = oprava.x;
|
||||
const y = oprava.y;
|
||||
const htmlElement = oprava.htmlElement;
|
||||
const pointer = oprava.pointer;
|
||||
|
||||
par.appendChild(pointer);
|
||||
par.appendChild(htmlElement);
|
||||
|
||||
const delta_y = (y > bott_max) ? 0: bott_max - y + H_SKIP;
|
||||
|
||||
pointer.style.left = x;
|
||||
pointer.style.top = y;
|
||||
pointer.style.width = w - x + W_SKIP;
|
||||
pointer.style.height = POINTER_MIN_H + delta_y;
|
||||
|
||||
htmlElement.style.left = w + W_SKIP;
|
||||
htmlElement.style.top = y + delta_y;
|
||||
|
||||
bott_max = Math.max(bott_max, htmlElement.offsetTop + htmlElement.offsetHeight + H_SKIP); // FIXME nemám páru, proč +H_SKIP funguje, ale opravuje to bug, že nově vytvořené korektury za sebou neměly mezeru
|
||||
var bott_max = 0;
|
||||
var comments_sorted = comments.sort(function (a,b) {
|
||||
return a[2] - b[2];
|
||||
//pokus o hezci kladeni poiteru, ale nic moc
|
||||
if( a[3] < b[3] ) {
|
||||
return (a[2] + pointer_min_h)- b[2];
|
||||
} else {
|
||||
return (a[2] - pointer_min_h)- b[2];
|
||||
}
|
||||
|
||||
if (par.offsetHeight < bott_max) par.style.height = bott_max;
|
||||
});
|
||||
//console.log("w:" + w);
|
||||
for (c in comments_sorted) {
|
||||
var id = comments_sorted[c][0];
|
||||
var x = comments_sorted[c][1];
|
||||
var y = comments_sorted[c][2];
|
||||
|
||||
var el = document.getElementById(id);
|
||||
var elp = document.getElementById(id + "-pointer");
|
||||
|
||||
if( el == null || elp == null ) {
|
||||
continue;
|
||||
}
|
||||
|
||||
par.appendChild(elp);
|
||||
par.appendChild(el);
|
||||
|
||||
var delta_y = (y > bott_max) ? 0: bott_max - y + h_skip;
|
||||
|
||||
elp.style.left = x;
|
||||
elp.style.top = y ;
|
||||
elp.style.width = w - x + w_skip;
|
||||
elp.style.height = pointer_min_h + delta_y;
|
||||
elp.img_id = img_id;
|
||||
el.img_id = img_id;
|
||||
|
||||
el.style.position = 'absolute';
|
||||
el.style.left = w + w_skip;
|
||||
el.style.top = y + delta_y;
|
||||
|
||||
var bott = el.offsetTop + el.offsetHeight;
|
||||
bott_max = ( bott_max > bott ) ? bott_max : bott;
|
||||
|
||||
//console.log( "par.w:" + par.style.width);
|
||||
|
||||
}
|
||||
if( par.offsetHeight < bott_max ) {
|
||||
//par.style.height = bott_max;
|
||||
//alert("preteklo to:"+ par.offsetHeight +",mx:" + bott_max );
|
||||
par.style.height = bott_max;
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
function place_comments() {
|
||||
for (let [img_id, opravy] of Object.entries(comments)) {
|
||||
place_comments_one_div(img_id, opravy)
|
||||
for (var i=0; i < comments.length-1; i++) {
|
||||
place_comments_one_div(comments[i][0], comments[i][1])
|
||||
}
|
||||
}
|
||||
|
||||
// ctrl-enter submits form
|
||||
function textarea_onkey(ev)
|
||||
{
|
||||
//console.log("ev:" + ev.keyCode + "," + ev.ctrlKey);
|
||||
if( (ev.keyCode == 13 || ev.keyCode == 10 ) && ev.ctrlKey ) {
|
||||
var form = document.getElementById('commform');
|
||||
if( form ) {
|
||||
save_scroll(form);
|
||||
//form.action ='';
|
||||
form.submit();
|
||||
}
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
//hide comment form
|
||||
function close_commform() {
|
||||
var formdiv = document.getElementById('commform-div');
|
||||
if( formdiv == null ) {
|
||||
alert("form null");
|
||||
return true;
|
||||
}
|
||||
formdiv.style.display = 'none';
|
||||
return false;
|
||||
}
|
||||
|
||||
// show comment form, when clicked to image
|
||||
function img_click(element, ev) {
|
||||
var body_class = document.body.className;
|
||||
switch(body_class){
|
||||
case "comitting":
|
||||
if (!confirm("Právě jsou zanášeny korektury, opravdu chcete přidat novou?"))
|
||||
return;
|
||||
break;
|
||||
case "deprecated":
|
||||
if (!confirm("Toto PDF je již zastaralé, opravdu chcete vytvořit korekturu?"))
|
||||
return;
|
||||
break;
|
||||
}
|
||||
|
||||
var dx, dy;
|
||||
var par = element.parentNode;
|
||||
if( ev.pageX != null ) {
|
||||
dx = ev.pageX - par.offsetLeft;
|
||||
dy = ev.pageY - par.offsetTop;
|
||||
} else { //IE
|
||||
dx = ev.offsetX;
|
||||
dy = ev.offsetY;
|
||||
}
|
||||
var img_id = element.id;
|
||||
if( element.img_id != null ) {
|
||||
// click was to '-pointer'
|
||||
img_id = element.img_id;
|
||||
}
|
||||
return show_form(img_id, dx, dy, '', '', '', '');
|
||||
}
|
||||
// hide or show text of correction
|
||||
function toggle_visibility(oid){
|
||||
var buttondiv = document.getElementById(oid+'-buttons')
|
||||
var text = document.getElementById(oid+'-body');
|
||||
if (text.style.display == 'none'){
|
||||
text.style.display = 'block';
|
||||
buttondiv.style.display = 'inline-block';
|
||||
}else {
|
||||
text.style.display = 'none';
|
||||
buttondiv.style.display = 'none';
|
||||
}
|
||||
for (var i=0;i<comments.length-1;i++){
|
||||
place_comments_one_div(comments[i][0], comments[i][1])
|
||||
}
|
||||
}
|
||||
|
||||
// show comment form, when 'edit' or 'comment' button pressed
|
||||
function box_edit(oid, action)
|
||||
{
|
||||
var divpointer = document.getElementById(oid + '-pointer');
|
||||
|
||||
var text;
|
||||
if (action == 'update') {
|
||||
var text_el = document.getElementById(oid + '-text');
|
||||
text = text_el.textContent; // FIXME původně tu bylo innerHTML.unescapeHTML()
|
||||
|
||||
} else {
|
||||
text = '';
|
||||
}
|
||||
|
||||
var dx = parseInt(divpointer.style.left);
|
||||
var dy = parseInt(divpointer.style.top);
|
||||
var divbox = document.getElementById(oid);
|
||||
//alert('not yet 2:' + text + text_el); // + divpointer.style.top "x" + divpo );
|
||||
id = oid.substring(2);
|
||||
return show_form(divbox.img_id, dx, dy, id, text, action);
|
||||
}
|
||||
|
||||
// show comment form when 'update-comment' button pressed
|
||||
function update_comment(oid,ktid)
|
||||
{
|
||||
var divpointer = document.getElementById(oid + '-pointer');
|
||||
var dx = parseInt(divpointer.style.left);
|
||||
var dy = parseInt(divpointer.style.top);
|
||||
|
||||
var divbox = document.getElementById(oid);
|
||||
var text = document.getElementById(ktid).textContent; // FIXME původně tu bylo innerHTML.unescapeHTML()
|
||||
|
||||
return show_form(divbox.img_id, dx, dy, ktid.substring(2), text, 'update-comment');
|
||||
}
|
||||
|
||||
//fill up comment form and show him
|
||||
function show_form(img_id, dx, dy, id, text, action) {
|
||||
var form = document.getElementById('commform');
|
||||
var formdiv = document.getElementById('commform-div');
|
||||
var textarea = document.getElementById('commform-text');
|
||||
var inputX = document.getElementById('commform-x');
|
||||
var inputY = document.getElementById('commform-y');
|
||||
var inputImgId = document.getElementById('commform-img-id');
|
||||
var inputId = document.getElementById('commform-id');
|
||||
var inputAction = document.getElementById('commform-action');
|
||||
var img = document.getElementById(img_id);
|
||||
|
||||
if( formdiv == null || textarea == null ) {
|
||||
alert("form null");
|
||||
return 1;
|
||||
}
|
||||
|
||||
//form.action = "#" + img_id;
|
||||
|
||||
// set hidden values
|
||||
inputX.value = dx;
|
||||
inputY.value = dy;
|
||||
inputImgId.value = img_id;
|
||||
inputId.value = id;
|
||||
inputAction.value = action;
|
||||
textarea.value = text;
|
||||
|
||||
//textarea.value = "dxy:"+ dx + "x" + dy + "\n" + 'id:' + img_id;
|
||||
|
||||
// show form
|
||||
formdiv.style.display = 'block';
|
||||
formdiv.style.left = dx;
|
||||
formdiv.style.top = dy;
|
||||
|
||||
img.parentNode.appendChild(formdiv);
|
||||
|
||||
textarea.focus();
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
function box_onmouseover(box)
|
||||
{
|
||||
var id = box.id;
|
||||
var pointer = document.getElementById(box.id + '-pointer');
|
||||
pointer.classList.remove('pointer');
|
||||
pointer.classList.add('pointer-hi');
|
||||
}
|
||||
|
||||
function box_onmouseout(box)
|
||||
{
|
||||
var id = box.id;
|
||||
var pointer = document.getElementById(box.id + '-pointer');
|
||||
pointer.classList.remove('pointer-hi');
|
||||
pointer.classList.add('pointer');
|
||||
}
|
||||
|
||||
function save_scroll(form)
|
||||
{
|
||||
//alert('save_scroll:' + document.body.scrollTop);
|
||||
form.scroll.value = document.body.scrollTop;
|
||||
//alert('save_scroll:' + form.scroll.value);
|
||||
return true;
|
||||
}
|
||||
|
||||
function toggle_corrections(aclass)
|
||||
{
|
||||
var stylesheets = document.styleSheets;
|
||||
var ssheet = null;
|
||||
for (var i=0;i<stylesheets.length; i++){
|
||||
if (stylesheets[i].title === "opraf-css"){
|
||||
ssheet = stylesheets[i];
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (! ssheet){
|
||||
return;
|
||||
}
|
||||
for (var i=0;i<ssheet.cssRules.length;i++){
|
||||
var rule = ssheet.cssRules[i];
|
||||
if (rule.selectorText === '.'+aclass){
|
||||
if (rule.style.display === ""){
|
||||
rule.style.display = "none";
|
||||
} else {
|
||||
rule.style.display = "";
|
||||
}
|
||||
}
|
||||
}
|
||||
place_comments();
|
||||
|
||||
}
|
||||
|
||||
|
||||
String.prototype.unescapeHTML = function () {
|
||||
return(
|
||||
this.replace(/&/g,'&').
|
||||
replace(/>/g,'>').
|
||||
replace(/</g,'<').
|
||||
replace(/"/g,'"')
|
||||
);
|
||||
};
|
||||
|
||||
|
|
|
@ -1,69 +0,0 @@
|
|||
{% load static %}
|
||||
|
||||
<div id="korektury-sipky">
|
||||
<button type='button' id="predchozi-korektura" title='Předchozí korektura'>
|
||||
<img class='toggle-button' src='{% static "korektury/imgs/hide.png" %}' alt='⬆'/>
|
||||
</button>
|
||||
<button type='button' id="predchozi-korektura-k-oprave" title='Předchozí korektura k opravě'>
|
||||
<img class='toggle-button' src='{% static "korektury/imgs/hide.png" %}' alt='⬆'/>
|
||||
</button>
|
||||
<button type='button' id="predchozi-korektura-k-zaneseni" title='Předchozí korektura k zaneseni'>
|
||||
<img class='toggle-button' src='{% static "korektury/imgs/hide.png" %}' alt='⬆'/>
|
||||
</button>
|
||||
<br>
|
||||
<button type='button' id="dalsi-korektura" title='Další korektura'>
|
||||
<img class='toggle-button' src='{% static "korektury/imgs/hide.png" %}' alt='⬇' style="transform: rotate(180deg);"/>
|
||||
</button>
|
||||
<button type='button' id="dalsi-korektura-k-oprave" title='Další korektura k opravě'>
|
||||
<img class='toggle-button' src='{% static "korektury/imgs/hide.png" %}' alt='⬇' style="transform: rotate(180deg);"/>
|
||||
</button>
|
||||
<button type='button' id="dalsi-korektura-k-zaneseni" title='Další korektura k zaneseni'>
|
||||
<img class='toggle-button' src='{% static "korektury/imgs/hide.png" %}' alt='⬇' style="transform: rotate(180deg);"/>
|
||||
</button>
|
||||
</div>
|
||||
|
||||
<script>
|
||||
const predchozi_k = document.getElementById('predchozi-korektura');
|
||||
const dalsi_k = document.getElementById('dalsi-korektura');
|
||||
const predchozi_k_o = document.getElementById('predchozi-korektura-k-oprave');
|
||||
const dalsi_k_o = document.getElementById('dalsi-korektura-k-oprave');
|
||||
const predchozi_k_z = document.getElementById('predchozi-korektura-k-zaneseni');
|
||||
const dalsi_k_z = document.getElementById('dalsi-korektura-k-zaneseni');
|
||||
|
||||
function dalsi_nebo_predchozi_korektura(dalsi=true, stav=null) {
|
||||
let predchozi = null;
|
||||
for (let [_, opravy] of Object.entries(comments)) {
|
||||
for (const oprava of opravy) {
|
||||
if (stav == null || oprava.status === stav) {
|
||||
console.log(oprava, oprava.htmlElement.getBoundingClientRect().y);
|
||||
const y = oprava.htmlElement.getBoundingClientRect().y;
|
||||
if (y >= -1) {
|
||||
if (dalsi) {
|
||||
if (y > 1) {
|
||||
oprava.htmlElement.scrollIntoView();
|
||||
return;
|
||||
}
|
||||
} else {
|
||||
console.log(predchozi);
|
||||
if (predchozi !== null) predchozi.htmlElement.scrollIntoView(); else alert("Výše už není žádná taková korektura.");
|
||||
return;
|
||||
}
|
||||
}
|
||||
predchozi = oprava;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (!dalsi && predchozi !== null) {
|
||||
predchozi.htmlElement.scrollIntoView();
|
||||
return;
|
||||
}
|
||||
alert("Žádná další korektura.");
|
||||
}
|
||||
|
||||
predchozi_k.addEventListener('click', _ => { dalsi_nebo_predchozi_korektura(false) });
|
||||
dalsi_k.addEventListener('click', _ => { dalsi_nebo_predchozi_korektura(true) });
|
||||
predchozi_k_o.addEventListener('click', _ => { dalsi_nebo_predchozi_korektura(false, "k_oprave") });
|
||||
dalsi_k_o.addEventListener('click', _ => { dalsi_nebo_predchozi_korektura(true, "k_oprave") });
|
||||
predchozi_k_z.addEventListener('click', _ => { dalsi_nebo_predchozi_korektura(false, "k_zaneseni") });
|
||||
dalsi_k_z.addEventListener('click', _ => { dalsi_nebo_predchozi_korektura(true, "k_zaneseni") });
|
||||
</script>
|
|
@ -1,97 +0,0 @@
|
|||
<div id="commform-div" style="display: none">
|
||||
<input size="24" name="au" value="{{user.first_name}} {{user.last_name}}" readonly/>
|
||||
<button type="button" id="commform-submit">Oprav!</button>
|
||||
<button type="button" id="commform-close">Zavřít</button>
|
||||
<br/>
|
||||
<textarea id="commform-text" cols=40 rows=10 name="txt"></textarea>
|
||||
<br/>
|
||||
<span id="commform-tagy">
|
||||
{% for tag in tagy %}
|
||||
<button type="button" class="korektury-tag" value="{{tag.id}}" data-selected="false" style="background: {{ tag.barva }};">{{tag.nazev}}</button>
|
||||
{% endfor %}
|
||||
</span>
|
||||
</div>
|
||||
|
||||
<script>
|
||||
class _CommForm {
|
||||
constructor() {
|
||||
this.div = document.getElementById('commform-div');
|
||||
this.text = document.getElementById('commform-text');
|
||||
this.submit_button = document.getElementById('commform-submit');
|
||||
const close_button = document.getElementById('commform-close');
|
||||
this.tagy = document.getElementById('commform-tagy');
|
||||
|
||||
|
||||
// ctrl-enter submits form
|
||||
this.text.addEventListener("keydown", ev => {
|
||||
if (ev.code === "Enter" && ev.ctrlKey) this.submit();
|
||||
});
|
||||
|
||||
close_button.addEventListener("click", _ => { this.close(); });
|
||||
this.submit_button.addEventListener("click", _ => { this.submit(); });
|
||||
for (const tag of this.tagy.getElementsByTagName("button")) tag.addEventListener("click", event => { this.toggle_tag(event); });
|
||||
}
|
||||
|
||||
toggle_tag(event) {
|
||||
const button = event.target;
|
||||
button.dataset.selected = String(button.dataset.selected === "false");
|
||||
}
|
||||
|
||||
|
||||
// schová commform
|
||||
close() { this.div.style.display = 'none'; }
|
||||
|
||||
// zobrazí commform (bez vyplňování)
|
||||
_show(img_id, x, y) {
|
||||
this.submit_button.disabled = false;
|
||||
this.div.style.display = 'block';
|
||||
this.div.style.left = x;
|
||||
this.div.style.top = y;
|
||||
|
||||
const img = document.getElementById("img-" + img_id);
|
||||
img.parentNode.appendChild(commform.div);
|
||||
|
||||
this.text.focus();
|
||||
}
|
||||
|
||||
// fill up comment form and show him
|
||||
show(img_id, x, y, text, oprava_id=-1, komentar_id=-1) {
|
||||
if (this.div.style.display !== 'none' && this.text.value !== "" && !confirm("Zavřít předchozí okénko přidávání korektury / editace komentáře?")) return;
|
||||
|
||||
// set hidden values
|
||||
this.x = x;
|
||||
this.y = y;
|
||||
this.imgID = img_id;
|
||||
this.oprava_id = oprava_id;
|
||||
this.komentar_id = komentar_id;
|
||||
this.text.value = text;
|
||||
|
||||
// show form
|
||||
if (oprava_id === -1 && komentar_id === -1) this.tagy.style.display = 'unset'; else this.tagy.style.display = 'none';
|
||||
this._show(img_id, x, y);
|
||||
}
|
||||
|
||||
submit() {
|
||||
this.submit_button.disabled = true;
|
||||
const data = new FormData(CSRF_FORM);
|
||||
data.append('x', this.x);
|
||||
data.append('y', this.y);
|
||||
data.append('img_id', this.imgID);
|
||||
data.append('oprava_id', this.oprava_id);
|
||||
data.append('komentar_id', this.komentar_id);
|
||||
if (this.oprava_id === -1 && this.komentar_id === -1) {
|
||||
const tagy = [];
|
||||
for (const tag of this.tagy.getElementsByTagName("button")) {
|
||||
if (tag.dataset.selected !== "false") tagy.push(tag.value);
|
||||
}
|
||||
data.append('tagy', String(tagy));
|
||||
}
|
||||
|
||||
data.append('text', this.text.value);
|
||||
|
||||
update_all({method: 'POST', body: data}, true, () => {this.close(); this.submit_button.disabled = false;});
|
||||
}
|
||||
}
|
||||
|
||||
const commform = new _CommForm();
|
||||
</script>
|
|
@ -1,86 +0,0 @@
|
|||
{% load static %}
|
||||
|
||||
<div class='comment' id='prekomentar' {# id='k{{k.id}}' #}>
|
||||
<div class='corr-header'>
|
||||
<div class='author'>{# {{k.autor}} #}</div>
|
||||
|
||||
<div class='float-right'>
|
||||
<button type='button' style='display: none' class='del-comment' title='Smaž komentář'>
|
||||
<img src='{% static "korektury/imgs/delete.png" %}' alt='del'/>
|
||||
</button>
|
||||
|
||||
<button type='button' class='update-comment' title='Uprav komentář'>
|
||||
<img src='{% static "korektury/imgs/edit.png"%}' alt='edit'/>
|
||||
</button>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
<div class='komtext'>{# {{k.text|linebreaks}} #}</div>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
<script>
|
||||
const prekomentar = document.getElementById('prekomentar');
|
||||
const komentare = {};
|
||||
|
||||
class Komentar {
|
||||
static update_or_create(komentar_data, oprava) {
|
||||
const id = komentar_data['id'];
|
||||
if (id in komentare) komentare[id].update(komentar_data);
|
||||
else new Komentar(komentar_data, oprava);
|
||||
}
|
||||
|
||||
#autor; #text;
|
||||
htmlElement;
|
||||
id; oprava; {# komentar_data; #}
|
||||
|
||||
/**
|
||||
*
|
||||
* @param komentar_data
|
||||
* @param {Oprava} oprava
|
||||
*/
|
||||
constructor(komentar_data, oprava) {
|
||||
this.htmlElement = prekomentar.cloneNode(true);
|
||||
this.#autor = this.htmlElement.getElementsByClassName('author')[0];
|
||||
this.#text = this.htmlElement.getElementsByClassName('komtext')[0];
|
||||
|
||||
this.id = komentar_data['id'];
|
||||
this.htmlElement.id = 'k' + this.id;
|
||||
|
||||
this.oprava = oprava;
|
||||
this.oprava.add_komentar_htmlElement(this.htmlElement);
|
||||
|
||||
this.update(komentar_data);
|
||||
|
||||
this.htmlElement.getElementsByClassName('update-comment')[0].addEventListener('click', _ => this.#update_comment());
|
||||
this.htmlElement.getElementsByClassName('del-comment')[0].addEventListener('click', _ => this.#delete_comment());
|
||||
|
||||
komentare[this.id] = this;
|
||||
}
|
||||
|
||||
update(komentar_data) {
|
||||
{# this.komentar_data = komentar_data; #}
|
||||
this.set_autor(komentar_data['autor']);
|
||||
this.set_text(komentar_data['text']);
|
||||
};
|
||||
|
||||
set_autor(autor) {this.#autor.textContent=autor;};
|
||||
set_text(text) {
|
||||
this.#text.innerHTML=text;
|
||||
};
|
||||
|
||||
|
||||
// show comment form when 'update-comment' button pressed
|
||||
#update_comment() {
|
||||
return commform.show(this.oprava.img_id, this.oprava.x, this.oprava.y, this.#text.textContent, -1, this.id);
|
||||
}
|
||||
|
||||
#delete_comment() {
|
||||
if (confirm('Opravdu smazat komentář?')) {
|
||||
throw {name : 'NotImplementedError', message: '(Webaři jsou) too lazy to implement'};
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
|
@ -1,165 +0,0 @@
|
|||
{% load static %}
|
||||
|
||||
<div id='prepointer' {# id='op{{o.id}}-pointer' #}
|
||||
class='pointer'
|
||||
data-highlight='false'
|
||||
{# data-opravastatus='{{o.status}}' #}
|
||||
></div>
|
||||
|
||||
<div id='preoprava' {# name='op{{o.id}}' id='op{{o.id}}' #}
|
||||
class='oprava'
|
||||
{# data-opravastatus='{{o.status}}' #}
|
||||
data-opravazobrazit='true'
|
||||
>
|
||||
<div class='corr-tagy'>
|
||||
{# {% for tag in o.tagy %} <span style="background:{{ tag.barva }}>{{ tag.text }}<span/> #}
|
||||
</div>
|
||||
|
||||
<div class='corr-body'>
|
||||
{# {% for k in o.komentare %} {% include "korektury/korekturovatko/__komentar.html" %} <hr> {% endfor %} #}
|
||||
</div>
|
||||
|
||||
<div class='corr-header'>
|
||||
<span class='float-right'>
|
||||
<span class='corr-buttons'>
|
||||
<button type='button' style='display: none' class='del' title='Smaž opravu'>
|
||||
<img src='{% static "korektury/imgs/delete.png"%}' alt='🗑️'/>
|
||||
</button>
|
||||
<button type='button' class='action' value='k_oprave' title='Označ jako neopravené'>
|
||||
<img src='{% static "korektury/imgs/undo.png"%}' alt='↪'/>
|
||||
</button>
|
||||
<button type='button' class='action' value='opraveno' title='Označ jako opravené'>
|
||||
<img src='{% static "korektury/imgs/check.png"%}' alt='✔️'/>
|
||||
</button>
|
||||
<button type='button' class='action' value='neni_chyba' title='Označ, že se nebude měnit'>
|
||||
<img src='{% static "korektury/imgs/cross.png" %}' alt='❌'/>
|
||||
</button>
|
||||
<button type='button' class='action' value='k_zaneseni' title='Označ jako připraveno k zanesení'>
|
||||
<img src='{% static "korektury/imgs/tex.png" %}' alt='TeX'/>
|
||||
</button>
|
||||
|
||||
<a href='{% url "admin:korektury_oprava_change" -1 %}' class='edit' title='Uprav korekturu jako takovou.' style="text-decoration: none;"> {# FIXME Udělat z toho tlačítko? #}
|
||||
<img src='{% static "korektury/imgs/edit.png"%}' alt='✏️' style="opacity: 0.5;"/> {# FIXME Odlišit jinak než pomocí opacity? #}
|
||||
</a>
|
||||
<button type='button' class='komentovat_disabled' title='Korekturu nelze komentovat, protože už je uzavřená' disabled=''>
|
||||
<img src='{% static "korektury/imgs/comment-gr.png" %}' alt='💭'/>
|
||||
</button>
|
||||
<button type='button' class='komentovat' title='Komentovat'>
|
||||
<img src='{% static "korektury/imgs/comment.png" %}' alt='💭'/>
|
||||
</button>
|
||||
</span>
|
||||
|
||||
<button type='button' class='toggle-vis' title='Skrýt/Zobrazit'>
|
||||
<img class='toggle-button' src='{% static "korektury/imgs/hide.png" %}' alt='⬆'/>
|
||||
</button>
|
||||
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<script>
|
||||
const preoprava = document.getElementById('preoprava');
|
||||
const prepointer = document.getElementById('prepointer');
|
||||
const opravy = {};
|
||||
|
||||
class Oprava {
|
||||
static update_or_create(oprava_data) {
|
||||
const id = oprava_data['id'];
|
||||
if (id in opravy) return opravy[id].update(oprava_data);
|
||||
else return new Oprava(oprava_data);
|
||||
}
|
||||
|
||||
#komentare; #tagy;
|
||||
htmlElement; pointer;
|
||||
id; x; y; img_id; status; zobrazit = true; {# oprava_data; #}
|
||||
|
||||
constructor(oprava_data) {
|
||||
this.htmlElement = preoprava.cloneNode(true);
|
||||
this.pointer = prepointer.cloneNode(true);
|
||||
this.#komentare = this.htmlElement.getElementsByClassName('corr-body')[0];
|
||||
this.#tagy = this.htmlElement.getElementsByClassName('corr-tagy')[0];
|
||||
|
||||
this.id = oprava_data['id'];
|
||||
this.htmlElement.id = 'op' + this.id;
|
||||
this.pointer.id = 'op' + this.id + '-pointer';
|
||||
|
||||
this.x = oprava_data['x'];
|
||||
this.y = oprava_data['y'];
|
||||
this.img_id = oprava_data['strana'];
|
||||
|
||||
this.update(oprava_data);
|
||||
|
||||
this.htmlElement.getElementsByClassName('toggle-vis')[0].addEventListener('click', _ => this.#toggle_visibility());
|
||||
for (const button of this.htmlElement.getElementsByClassName('action'))
|
||||
button.addEventListener('click', async event => this.#zmenStavKorektury(event));
|
||||
this.htmlElement.getElementsByClassName('komentovat')[0].addEventListener('click', _ => this.#comment())
|
||||
this.htmlElement.getElementsByClassName('del')[0].addEventListener('click', _ => this.#delete());
|
||||
const odkaz_editace = this.htmlElement.getElementsByClassName('edit')[0];
|
||||
odkaz_editace.href = odkaz_editace.href.replace("-1", this.id);
|
||||
odkaz_editace.onclick = ev => { if (!confirm("Editace korektury je velmi pokročilá featura umožňující přesouvat korekturu nebo přidávat informované orgy, opravdu chceš pokračovat do adminu?")) ev.preventDefault(); };
|
||||
|
||||
this.htmlElement.addEventListener('mouseover', _ => this.pointer.dataset.highlight = 'true');
|
||||
this.htmlElement.addEventListener('mouseout', _ => this.pointer.dataset.highlight = 'false');
|
||||
|
||||
opravy[this.id] = this;
|
||||
if (this.img_id in comments) comments[this.img_id].push(this); else alert("Někdo korekturoval stranu, která neexistuje. Dejte vědět webařům :)");
|
||||
}
|
||||
|
||||
update(oprava_data) {
|
||||
{# this.oprava_data = oprava_data; #}
|
||||
this.set_status(oprava_data['status']);
|
||||
this.#tagy.innerHTML = "";
|
||||
for (const tag of oprava_data["tagy"]) {
|
||||
const span = document.createElement("span");
|
||||
span.innerHTML = tag["nazev"];
|
||||
span.classList.add("korektury-tag");
|
||||
span.style.backgroundColor = tag["barva"];
|
||||
this.#tagy.appendChild(span);
|
||||
}
|
||||
return this;
|
||||
};
|
||||
|
||||
set_status(status) {
|
||||
this.status = status;
|
||||
this.htmlElement.dataset.opravastatus=status;
|
||||
this.pointer.dataset.opravastatus=status;
|
||||
};
|
||||
|
||||
add_komentar_htmlElement(htmlElement) {
|
||||
this.#komentare.appendChild(htmlElement);
|
||||
this.#komentare.appendChild(document.createElement('hr'));
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
// hide or show text of correction
|
||||
#toggle_visibility(){
|
||||
this.zobrazit = !this.zobrazit;
|
||||
this.htmlElement.dataset.opravazobrazit = String(this.zobrazit);
|
||||
place_comments()
|
||||
}
|
||||
|
||||
// show comment form, when 'comment' button pressed
|
||||
#comment() { commform.show(this.img_id, this.x, this.y, "", this.id); }
|
||||
|
||||
#zmenStavKorektury(event) {
|
||||
const data = new FormData(CSRF_FORM);
|
||||
data.append('id', this.id);
|
||||
data.append('action', event.target.value);
|
||||
|
||||
fetch('{% url "korektury_api_oprava_stav" %}', {method: 'POST', body: data})
|
||||
.then(response => {
|
||||
if (!response.ok) {alert('Něco se nepovedlo:' + response.statusText);}
|
||||
else response.json().then(data => this.set_status(data['status']));
|
||||
})
|
||||
.catch(error => {alert('Něco se nepovedlo:' + error);});
|
||||
}
|
||||
|
||||
#delete() {
|
||||
if (confirm('Opravdu smazat korekturu?')) {
|
||||
throw {name : 'NotImplementedError', message: '(Webaři jsou) too lazy to implement'};
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
|
@ -1,51 +0,0 @@
|
|||
{% for i in img_indexes %}
|
||||
<div class='imgdiv'>
|
||||
<img
|
||||
id='img-{{i}}'
|
||||
width='1021' height='1448'
|
||||
src='/media/korektury/img/{{img_prefix}}-{{i}}.png'
|
||||
alt='Strana {{ i|add:1 }}'
|
||||
class="strana"
|
||||
/>
|
||||
</div>
|
||||
|
||||
<hr/>
|
||||
{% endfor %}
|
||||
|
||||
<script>
|
||||
// Mapování stránka -> korektury
|
||||
const comments = {
|
||||
{% for s in img_indexes %}
|
||||
{{s}}: []{% if not forloop.last %},{% endif %}
|
||||
{% endfor %}
|
||||
};
|
||||
|
||||
// show comment form, when clicked to image
|
||||
for (const image of document.getElementsByClassName('strana')) {
|
||||
image.addEventListener('click', ev => {
|
||||
switch (document.body.dataset.status) {
|
||||
case 'zanaseni':
|
||||
if (!confirm('Právě jsou zanášeny korektury, opravdu chcete přidat novou?'))
|
||||
return;
|
||||
break;
|
||||
case 'zastarale':
|
||||
if (!confirm('Toto PDF je již zastaralé, opravdu chcete vytvořit korekturu?'))
|
||||
return;
|
||||
break;
|
||||
}
|
||||
|
||||
let dx, dy;
|
||||
const par = image.parentNode;
|
||||
if (ev.pageX != null) {
|
||||
dx = ev.pageX - par.offsetLeft;
|
||||
dy = ev.pageY - par.offsetTop;
|
||||
} else { //IE a další
|
||||
dx = ev.offsetX;
|
||||
dy = ev.offsetY;
|
||||
}
|
||||
const img_id = image.id.substring(4);
|
||||
commform.show(img_id, dx, dy, '');
|
||||
console.log("Pro přesun korektur: strana = " + img_id + ", x = " + dx + ", y = " + dy);
|
||||
});
|
||||
}
|
||||
</script>
|
|
@ -1,52 +0,0 @@
|
|||
{% include "korektury/korekturovatko/__edit_komentar.html" %}
|
||||
|
||||
{% include "korektury/korekturovatko/__stranky.html" %}
|
||||
|
||||
{# {% for o in opravy %} {% include "korektury/korekturovatko/__oprava.html" %} {% endfor %} #}
|
||||
{% include "korektury/korekturovatko/__oprava.html" %}
|
||||
{% include "korektury/korekturovatko/__komentar.html" %}
|
||||
|
||||
{% include "korektury/korekturovatko/__dalsi_korektura.html" %}
|
||||
|
||||
<button type="button" id="korektury-aktualizace">Aktualizuj korektury.</button>
|
||||
|
||||
<script>
|
||||
/**
|
||||
*
|
||||
* @param {RequestInit} data
|
||||
* @param {Boolean} catchError
|
||||
* @param pri_uspechu Akce, která se má provést při úspěchu (speciálně zavřít formulář)
|
||||
*/
|
||||
function update_all(data={}, catchError=true, pri_uspechu=null) { // FIXME není mi jasné, zda v {} nemá být `cache: "no-store"`, aby prohlížeč necachoval GET.
|
||||
fetch('{% url "korektury_api_opravy_a_komentare" pdf.id %}', data)
|
||||
.then(response => {
|
||||
if (!response.ok && catchError) {alert('Něco se nepovedlo:' + response.statusText);}
|
||||
else response.json().then(data => {
|
||||
if (pri_uspechu) pri_uspechu();
|
||||
for (const oprava_data of data["context"]) {
|
||||
const oprava = Oprava.update_or_create(oprava_data);
|
||||
for (const komentar_data of oprava_data["komentare"]) {
|
||||
Komentar.update_or_create(komentar_data, oprava);
|
||||
}
|
||||
}
|
||||
|
||||
place_comments();
|
||||
});
|
||||
})
|
||||
.catch(error => {if (catchError) alert('Něco se nepovedlo:' + error);});
|
||||
}
|
||||
|
||||
update_all();
|
||||
|
||||
// FIXME není mi jasné, zda v {} nemá být `cache: "no-store"`, aby prohlížeč necachoval GET.
|
||||
document.getElementById("korektury-aktualizace").addEventListener("click", _ => update_all({}, false));
|
||||
|
||||
// FIXME není mi jasné, zda v {} nemá být `cache: "no-store"`, aby prohlížeč necachoval GET.
|
||||
setInterval(() => update_all({}, false), 120000); // Každý dvě minuty fetchni korektury
|
||||
</script>
|
||||
|
||||
<form id='CSRF_form' style='display: none'>{% csrf_token %}</form>
|
||||
|
||||
<script>
|
||||
const CSRF_FORM = document.getElementById('CSRF_form');
|
||||
</script>
|
|
@ -1,51 +0,0 @@
|
|||
Zobrazit:
|
||||
<input type="checkbox"
|
||||
id="k_oprave_checkbox"
|
||||
name="k_oprave_checkbox"
|
||||
onchange="toggle_corrections('k_oprave')" checked>
|
||||
<label for="k_oprave_checkbox">K opravě ({{k_oprave_cnt}})</label>
|
||||
<input type="checkbox"
|
||||
id="opraveno_checkbox"
|
||||
name="opraveno_checkbox"
|
||||
onchange="toggle_corrections('opraveno')" checked>
|
||||
<label for="opraveno_checkbox">Opraveno ({{opraveno_cnt}})</label>
|
||||
<input type="checkbox"
|
||||
id="neni_chyba_checkbox"
|
||||
name="neni_chyba_checkbox"
|
||||
onchange="toggle_corrections('neni_chyba')" checked>
|
||||
<label for="neni_chyba_checkbox">Není chyba ({{neni_chyba_cnt}})</label>
|
||||
<input type="checkbox"
|
||||
id="k_zaneseni_checkbox"
|
||||
name="k_zaneseni_checkbox"
|
||||
onchange="toggle_corrections('k_zaneseni')" checked>
|
||||
<label for="k_zaneseni_checkbox">K zanesení ({{k_zaneseni_cnt}})</label>
|
||||
|
||||
<hr/>
|
||||
|
||||
<script>
|
||||
function toggle_corrections(aclass)
|
||||
{
|
||||
const stylesheets = document.styleSheets;
|
||||
let ssheet = null;
|
||||
for (let i=0; i<stylesheets.length; i++){
|
||||
if (stylesheets[i].title === "opraf-css"){
|
||||
ssheet = stylesheets[i];
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (! ssheet){
|
||||
return;
|
||||
}
|
||||
for (let i=0; i<ssheet.cssRules.length; i++){
|
||||
const rule = ssheet.cssRules[i];
|
||||
if (rule.selectorText === '[data-opravastatus="'+aclass+'"]'){
|
||||
if (rule.style.display === ""){
|
||||
rule.style.display = "none";
|
||||
} else {
|
||||
rule.style.display = "";
|
||||
}
|
||||
}
|
||||
}
|
||||
place_comments();
|
||||
}
|
||||
</script>
|
|
@ -1,44 +0,0 @@
|
|||
<h4>Změnit stav PDF:</h4>
|
||||
<i>Aktuální: {{pdf.status}}</i>
|
||||
<br>
|
||||
<form method="post" id="PDFSTAV_FORM">
|
||||
{% csrf_token %}
|
||||
<input type="radio" name="state" value="{{ pdf.STATUS.PRIDAVANI }}" {% if pdf.status == pdf.STATUS.PRIDAVANI %} checked {% endif %}>Přidávání korektur
|
||||
<br>
|
||||
<input type="radio" name="state" value="{{ pdf.STATUS.ZANASENI }}" {% if pdf.status == pdf.STATUS.ZANASENI %} checked {% endif %}>Zanášení korektur
|
||||
<br>
|
||||
<input type="radio" name="state" value="{{ pdf.STATUS.ZASTARALE }}" {% if pdf.status == pdf.STATUS.ZASTARALE %} checked {% endif %}>Zastaralé, nekorigovat
|
||||
<br>
|
||||
<input type='submit' value='Změnit stav PDF'/>
|
||||
</form>
|
||||
|
||||
<script>
|
||||
const pdfstav_form = document.getElementById('PDFSTAV_FORM');
|
||||
|
||||
/**
|
||||
*
|
||||
* @param {RequestInit} data
|
||||
* @param {Boolean} catchError
|
||||
*/
|
||||
function fetchStav(data, catchError=true) {
|
||||
fetch("{% url 'korektury_api_pdf_stav' pdf.id %}", data
|
||||
)
|
||||
.then(response => {
|
||||
if (!response.ok) { if (catchError) alert("Něco se nepovedlo:" + response.statusText);}
|
||||
else response.json().then(data => document.body.dataset.status = data["status"]);
|
||||
})
|
||||
.catch(error => {if (catchError) alert("Něco se nepovedlo:" + error);});
|
||||
}
|
||||
|
||||
pdfstav_form.addEventListener('submit', async event => {
|
||||
event.preventDefault();
|
||||
|
||||
const data = new FormData(pdfstav_form);
|
||||
fetchStav({method: "POST", body: data});
|
||||
});
|
||||
|
||||
|
||||
// FIXME není mi jasné, zda v {} nemá být `cache: "no-store"`, aby prohlížeč necachoval get.
|
||||
setInterval(() => fetchStav({}, false), 120000); // Každý dvě minuty fetchni stav
|
||||
</script>
|
||||
|
|
@ -1,44 +0,0 @@
|
|||
{% load static %}
|
||||
|
||||
<html>
|
||||
<head>
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
|
||||
<link rel="stylesheet" title="opraf-css" type="text/css" media="screen, projection" href="{% static "korektury/opraf.css"%}?version=1" />
|
||||
<link href="{% static 'css/rozliseni.css' %}?version=1" rel="stylesheet">
|
||||
<script src="{% static "korektury/opraf.js"%}?version=1"></script>
|
||||
<title>Korektury {{pdf.nazev}}</title>
|
||||
</head>
|
||||
<body class="{{ LOCAL_TEST_PROD }}web" data-status="{{ pdf.status }}" onload='place_comments()'>
|
||||
|
||||
<h1>Korektury {{pdf.nazev}}</h1>
|
||||
|
||||
<h2 class="textzanaseni"> Probíhá zanášení korektur, zvažte, zda chcete přidávat nové </h2>
|
||||
<h2 class="textzastarale"> Toto PDF je již zastaralé, nepřidávejte nové korektury </h2>
|
||||
|
||||
<i>{{pdf.komentar}}</i>
|
||||
<br>
|
||||
<i>Klikni na chybu, napiš komentář</i> |
|
||||
<a href="{{pdf.pdf.url}}">stáhnout PDF (bez korektur)</a> |
|
||||
<a href="../">seznam souborů</a> |
|
||||
<a href="/admin/korektury/korekturovanepdf/">Spravovat PDF</a> |
|
||||
<a href="../help">nápověda</a> |
|
||||
|
|
||||
<a href="/">hlavní stránka</a> |
|
||||
<a href="https://mam.mff.cuni.cz/wiki">wiki</a> |
|
||||
<hr />
|
||||
|
||||
{% include "korektury/korekturovatko/_schovani_korektur.html" %}
|
||||
|
||||
{% include "korektury/korekturovatko/_main.html" %}
|
||||
|
||||
{% include "korektury/korekturovatko/_zmena_stavu.html" %}
|
||||
|
||||
<hr/>
|
||||
<p>
|
||||
Děkujeme opravovatelům:
|
||||
{% for z in zasluhy %}
|
||||
{{z.autor}} ({{z.pocet}}){% if not forloop.last %},{% endif %}
|
||||
{% endfor %}</p>
|
||||
<hr>
|
||||
</body>
|
||||
</html>
|
244
korektury/templates/korektury/opraf.html
Normal file
244
korektury/templates/korektury/opraf.html
Normal file
|
@ -0,0 +1,244 @@
|
|||
{% load static %}
|
||||
|
||||
<html>
|
||||
<head>
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
|
||||
<link rel="stylesheet" title="opraf-css" type="text/css" media="screen, projection" href="{% static "korektury/opraf.css"%}" />
|
||||
<link href="{% static 'css/rozliseni.css' %}?version=1" rel="stylesheet">
|
||||
<script src="{% static "korektury/opraf.js"%}"></script>
|
||||
<title>Korektury {{pdf.nazev}}</title>
|
||||
</head>
|
||||
<body class="{{ LOCAL_TEST_PROD }}web{% if pdf.status == 'zanaseni'%} comitting{% elif pdf.status == 'zastarale' %} deprecated{% endif %}" onload='place_comments()'>
|
||||
<h1>Korektury {{pdf.nazev}}</h1>
|
||||
{% if pdf.status == 'zanaseni' %} <h2> Probíhá zanášení korektur, zvažte, zda chcete přidávat nové </h2> {% endif %}
|
||||
{% if pdf.status == 'zastarale' %} <h2> Toto PDF je již zastaralé, nepřidávejte nové korektury </h2> {% endif %}
|
||||
<i>{{pdf.komentar}}</i>
|
||||
<br>
|
||||
<i>Klikni na chybu, napiš komentář</i> |
|
||||
<a href="{{pdf.pdf.url}}">stáhnout PDF (bez korektur)</a> |
|
||||
<a href="../">seznam souborů</a> |
|
||||
<a href="/admin/korektury/korekturovanepdf/">Spravovat PDF</a> |
|
||||
<a href="../help">nápověda</a> |
|
||||
|
|
||||
<a href="/">hlavní stránka</a> |
|
||||
<a href="https://mam.mff.cuni.cz/wiki">wiki</a> |
|
||||
<hr />
|
||||
Zobrazit:
|
||||
<input type="checkbox"
|
||||
id="k_oprave_checkbox"
|
||||
name="k_oprave_checkbox"
|
||||
onchange="toggle_corrections('k_oprave')" checked>
|
||||
<label for="k_oprave_checkbox">K opravě ({{k_oprave_cnt}})</label>
|
||||
<input type="checkbox"
|
||||
id="opraveno_checkbox"
|
||||
name="opraveno_checkbox"
|
||||
onchange="toggle_corrections('opraveno')" checked>
|
||||
<label for="opraveno_checkbox">Opraveno ({{opraveno_cnt}})</label>
|
||||
<input type="checkbox"
|
||||
id="neni_chyba_checkbox"
|
||||
name="neni_chyba_checkbox"
|
||||
onchange="toggle_corrections('neni_chyba')" checked>
|
||||
<label for="neni_chyba_checkbox">Není chyba ({{neni_chyba_cnt}})</label>
|
||||
<input type="checkbox"
|
||||
id="k_zaneseni_checkbox"
|
||||
name="k_zaneseni_checkbox"
|
||||
onchange="toggle_corrections('k_zaneseni')" checked>
|
||||
<label for="k_zaneseni_checkbox">K zanesení ({{k_zaneseni_cnt}})</label>
|
||||
|
||||
<hr/>
|
||||
|
||||
<div id="commform-div">
|
||||
<!-- Pridat korekturu / komentar !-->
|
||||
<form action='' onsubmit='save_scroll(this)' id="commform" method="POST">
|
||||
{% csrf_token %}
|
||||
<input size="24" name="au" value="{{user.first_name}} {{user.last_name}}" readonly/>
|
||||
<input type=submit value="Oprav!"/>
|
||||
<button type="button" onclick="close_commform()">Zavřít</button>
|
||||
<br/>
|
||||
<textarea onkeypress="textarea_onkey(event);" id="commform-text" cols=40 rows=10 name="txt"></textarea>
|
||||
<br/>
|
||||
<input type="hidden" size="3" name="pdf" value='{{pdf.id}}'/>
|
||||
<input type="hidden" size="3" id="commform-x" name="x"/>
|
||||
<input type="hidden" size="3" id="commform-y" name="y"/>
|
||||
<input type="hidden" size="3" id="commform-img-id" name="img-id"/>
|
||||
<input type="hidden" size="3" id="commform-id" name="id"/>
|
||||
<input type="hidden" size="3" id="commform-action" name="action"/>
|
||||
<input type="hidden" size="3" id="commform-action" name="scroll"/>
|
||||
</form>
|
||||
<!-- /Pridat korekturu / komentar !-->
|
||||
</div>
|
||||
|
||||
{% for i in img_indexes %}
|
||||
<div class='imgdiv'>
|
||||
<img width='1021' height='1448'
|
||||
onclick='img_click(this,event)' id='img-{{i}}'
|
||||
src='/media/korektury/img/{{img_prefix}}-{{i}}.png'/>
|
||||
</div>
|
||||
<hr/>
|
||||
{% endfor %}
|
||||
|
||||
<h4>Změnit stav PDF:</h4>
|
||||
<i>Aktuální: {{pdf.status}}</i>
|
||||
<br>
|
||||
<!-- Zmenit stav PDF !-->
|
||||
<form method="post">
|
||||
{% csrf_token %}
|
||||
<input type='hidden' name='action' value='set-state'/>
|
||||
<input type='hidden' name='pdf' value='{{pdf.id}}'/>
|
||||
<input type="radio" name="state" value="adding" {% if pdf.status == 'pridavani' %} checked {% endif %}>Přidávání korektur
|
||||
<br>
|
||||
<input type="radio" name="state" value="comitting" {% if pdf.status == 'zanaseni' %} checked {% endif %}>Zanášení korektur
|
||||
<br>
|
||||
<input type="radio" name="state" value="deprecated" {% if pdf.status == 'zastarale' %} checked {% endif %}>Zastaralé, nekorigovat
|
||||
<br>
|
||||
<input type='submit' value='Změnit stav PDF'/>
|
||||
</form>
|
||||
|
||||
<!-- /Zmenit stav PDF !-->
|
||||
<hr/>
|
||||
<p>
|
||||
Děkujeme opravovatelům:
|
||||
{% for z in zasluhy %}
|
||||
{{z.autor}} ({{z.pocet}}){% if not forloop.last %},{% endif %}
|
||||
{% endfor %}</p>
|
||||
<hr>
|
||||
|
||||
{% for o in opravy %}
|
||||
<div onclick='img_click(this,event)'
|
||||
id='op{{o.id}}-pointer'
|
||||
class='pointer {{o.status}}'>
|
||||
</div>
|
||||
<div name='op{{o.id}}' id='op{{o.id}}'
|
||||
class='box {{o.status}}'
|
||||
onmouseover='box_onmouseover(this)'
|
||||
onmouseout='box_onmouseout(this)'>
|
||||
|
||||
<div class='corr-header'>
|
||||
<span class='author' id='op{{o.id}}-autor'>{{o.autor}}</span>
|
||||
<span class='float-right'>
|
||||
<span id='op{{o.id}}-buttons'>
|
||||
<!-- Existujici korektura !-->
|
||||
<form action='' onsubmit='save_scroll(this)' method='POST'>
|
||||
{% csrf_token %}
|
||||
<input type='hidden' name="au" value="{{o.autor}}"/>
|
||||
<input type='hidden' name='pdf' value='{{pdf.id}}'>
|
||||
<input type='hidden' name='id' value='{{o.id}}'>
|
||||
<input type='hidden' name='scroll'>
|
||||
|
||||
{% if o.komentare %}
|
||||
<button name='action' value='del' type='button'
|
||||
title="Opravu nelze smazat – už ji někdo okomentoval">
|
||||
<img src="{% static "korektury/imgs/delete-gr.png"%}"/>
|
||||
</button>
|
||||
{% else %}
|
||||
<button type='submit' name='action' value='del' title='Smaž opravu'>
|
||||
<img src="{% static "korektury/imgs/delete.png"%}"/>
|
||||
</button>
|
||||
{% endif %}
|
||||
{% if o.status != 'k_oprave' %}
|
||||
<button type='submit' name='action' value='undone' title='Označ jako neopravené'>
|
||||
<img src="{% static "korektury/imgs/undo.png"%}"/>
|
||||
</button>
|
||||
{% endif %}
|
||||
{% if o.status != 'opraveno' %}
|
||||
<button type='submit' name='action' value='done' title='Označ jako opravené'>
|
||||
<img src="{% static "korektury/imgs/check.png"%}"/>
|
||||
</button>
|
||||
{% endif %}
|
||||
{% if o.status != 'neni_chyba' %}
|
||||
<button type='submit' name='action' value='wontfix' title='Označ, že se nebude měnit'>
|
||||
<img src="{% static "korektury/imgs/cross.png" %}"/>
|
||||
</button>
|
||||
{% endif %}
|
||||
{% if o.status != 'k_zaneseni' %}
|
||||
<button type='submit' name='action' value='ready' title='Označ jako připraveno k zanesení'>
|
||||
<img src="{% static "korektury/imgs/tex.png" %}"/>
|
||||
</button>
|
||||
{% endif %}
|
||||
</form>
|
||||
<!-- /Existujici korektura !-->
|
||||
|
||||
{% if o.komentare %}
|
||||
<button type='button' title="Korekturu nelze upravit – už ji někdo okomentoval">
|
||||
<img src="{% static "korektury/imgs/edit-gr.png" %}"/>
|
||||
</button>
|
||||
{% else %}
|
||||
<button type='button' onclick='box_edit("op{{o.id}}","update");' title='Oprav opravu'>
|
||||
<img src="{% static "korektury/imgs/edit.png" %}"/>
|
||||
</button>
|
||||
{% endif %}
|
||||
{% if o.status == 'opraveno' or o.status == 'neni_chyba' %}
|
||||
<button type='button' title='Korekturu nelze komentovat, protože už je uzavřená'>
|
||||
<img src="{% static "korektury/imgs/comment-gr.png" %}"/>
|
||||
</button>
|
||||
{% else %}
|
||||
<button type='button' onclick='box_edit("op{{o.id}}", "comment");' title='Komentovat'>
|
||||
<img src="{% static "korektury/imgs/comment.png" %}"/>
|
||||
</button>
|
||||
{% endif %}
|
||||
|
||||
</span>
|
||||
<button type='button' onclick='toggle_visibility("op{{o.id}}");' title='Skrýt/Zobrazit'>
|
||||
<img src="{% static "korektury/imgs/hide.png" %}"/>
|
||||
</button>
|
||||
|
||||
</span>
|
||||
</div>
|
||||
<div class='corr-body' id='op{{o.id}}-body'>
|
||||
<div id='op{{o.id}}-text'>{{o.text|linebreaks}}</div>
|
||||
|
||||
{% for k in o.komentare %}
|
||||
<hr>
|
||||
<div class='comment' id='k{{k.id}}'>
|
||||
<div class='corr-header'>
|
||||
<div class='author'>{{k.autor}}</div>
|
||||
<div class="float-right">
|
||||
<!-- Komentar !-->
|
||||
<form action='' onsubmit='save_scroll(this)' method='POST'>
|
||||
{% csrf_token %}
|
||||
<input type='hidden' name='pdf' value='{{pdf.id}}'>
|
||||
<input type='hidden' name='id' value='{{k.id}}'>
|
||||
<input type='hidden' name='scroll'>
|
||||
{% if forloop.last %}
|
||||
<button type='submit' name='action' value='del-comment' title='Smaž komentář'
|
||||
onclick='return confirm("Opravdu smazat komentář?")'>
|
||||
<img src="{% static "korektury/imgs/delete.png" %}"/>
|
||||
</button>
|
||||
{% else %}
|
||||
<button name='action' value='del-comment' type='button'
|
||||
title="Komentář nelze smazat – existuje novější">
|
||||
<img src="{% static "korektury/imgs/delete-gr.png"%}"/>
|
||||
</button>
|
||||
{% endif %}
|
||||
</form>
|
||||
<!-- /Komentar !-->
|
||||
{% if forloop.last %}
|
||||
<button type='button' onclick="update_comment('op{{o.id}}','kt{{k.id}}');" title='Uprav komentář'>
|
||||
<img src="{% static "korektury/imgs/edit.png"%}"/>
|
||||
</button>
|
||||
{% else %}
|
||||
<button type='button' title="Komentář nelze upravit – existuje novější">
|
||||
<img src="{% static "korektury/imgs/edit-gr.png" %}"/>
|
||||
</button>
|
||||
{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
<div id='kt{{k.id}}'>{{k.text|linebreaks}}</div>
|
||||
</div>
|
||||
{% endfor %}
|
||||
</div>
|
||||
</div>
|
||||
{% endfor %}
|
||||
|
||||
<script>
|
||||
var comments = [
|
||||
{% for s in opravy_strany %}
|
||||
["img-{{s.strana}}", [{% for o in s.op_id %}["op{{o.id}}",{{o.x}},{{o.y}}],{% endfor %}[]]],
|
||||
{% endfor %}
|
||||
[]]
|
||||
{% if scroll %}
|
||||
window.scrollTo(0,{{scroll}});
|
||||
{% endif %}
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
|
@ -1,6 +1,4 @@
|
|||
from django.urls import path
|
||||
from django.urls import include
|
||||
|
||||
from personalni.utils import org_required
|
||||
from . import views
|
||||
|
||||
|
@ -9,6 +7,4 @@ urlpatterns = [
|
|||
path('korektury/neseskupene/', org_required(views.KorekturyAktualniListView.as_view()), name='korektury_neseskupene_list'),
|
||||
path('korektury/zastarale/', org_required(views.KorekturyZastaraleListView.as_view()), name='korektury_stare_list'),
|
||||
path('korektury/<int:pdf>/', org_required(views.KorekturyView.as_view()), name='korektury'),
|
||||
|
||||
path('korektury/api/', include('korektury.api.urls')),
|
||||
]
|
||||
|
|
|
@ -1,53 +0,0 @@
|
|||
from django.core.mail import EmailMessage
|
||||
from django.http import HttpRequest
|
||||
from django.urls import reverse
|
||||
|
||||
from korektury.models import Komentar, Oprava
|
||||
from personalni.models import Organizator
|
||||
|
||||
|
||||
def send_email_notification_komentar(oprava: Oprava, autor: Organizator, request: HttpRequest):
|
||||
''' Rozesle e-mail pri pridani komentare / opravy,
|
||||
ktery obsahuje text vlakna opravy.
|
||||
'''
|
||||
|
||||
# parametry e-mailu
|
||||
#odkaz = "https://mam.mff.cuni.cz/korektury/{}/".format(oprava.pdf.pk)
|
||||
odkaz = request.build_absolute_uri(reverse('korektury', kwargs={'pdf': oprava.pdf.pk}))
|
||||
odkaz = f"{odkaz}#op{oprava.id}-pointer"
|
||||
from_email = 'korekturovatko@mam.mff.cuni.cz'
|
||||
subject = 'Nová korektura od {} v {}'.format(autor, oprava.pdf.nazev)
|
||||
texty = []
|
||||
for kom in Komentar.objects.filter(oprava=oprava):
|
||||
texty.append((kom.autor.osoba.plne_jmeno(),kom.text))
|
||||
optext = "\n\n\n".join([": ".join(t) for t in texty])
|
||||
text = u"Text komentáře:\n\n{}\n\n=== Konec textu komentáře ===\n\
|
||||
\nodkaz do korekturovátka: {}\n\
|
||||
\nVaše korekturovátko\n".format(optext, odkaz)
|
||||
|
||||
# Prijemci e-mailu
|
||||
emails = set()
|
||||
|
||||
# nalezeni e-mailu na autory komentaru
|
||||
for org in oprava.informovani_orgove.all():
|
||||
email_komentujiciho = org.osoba.email
|
||||
if email_komentujiciho:
|
||||
emails.add(email_komentujiciho)
|
||||
|
||||
# zodpovedni orgove
|
||||
for org in oprava.pdf.orgove.all():
|
||||
email_zobpovedny = org.osoba.email
|
||||
if email_zobpovedny:
|
||||
emails.add(email_zobpovedny)
|
||||
|
||||
# odstran e-mail autora opravy
|
||||
email = autor.osoba.email
|
||||
if email:
|
||||
emails.discard(email)
|
||||
|
||||
EmailMessage(
|
||||
subject=subject,
|
||||
body=text,
|
||||
from_email=from_email,
|
||||
to=list(emails),
|
||||
).send()
|
|
@ -2,18 +2,24 @@ from django.shortcuts import get_object_or_404, render
|
|||
from django.views import generic
|
||||
from django.conf import settings
|
||||
from django.http import HttpResponseForbidden
|
||||
from django.core.mail import EmailMessage
|
||||
from django.db.models import Count,Q
|
||||
|
||||
from .utils import send_email_notification_komentar
|
||||
from .models import Oprava, Komentar, KorekturovanePDF, Organizator, KorekturaTag
|
||||
from .models import Oprava,Komentar,KorekturovanePDF, Organizator
|
||||
from .forms import OpravaForm
|
||||
|
||||
import subprocess
|
||||
import shutil
|
||||
import os
|
||||
|
||||
class KorekturyListView(generic.ListView):
|
||||
model = KorekturovanePDF
|
||||
# Nefunguje, filtry se vubec nepouziji
|
||||
queryset = KorekturovanePDF.objects.annotate(
|
||||
k_oprave_cnt=Count('oprava',distinct=True,filter=Q(oprava__status=Oprava.STATUS.K_OPRAVE)),
|
||||
opraveno_cnt=Count('oprava',distinct=True,filter=Q(oprava__status=Oprava.STATUS.OPRAVENO)),
|
||||
neni_chyba_cnt=Count('oprava',distinct=True,filter=Q(oprava__status=Oprava.STATUS.NENI_CHYBA)),
|
||||
k_zaneseni_cnt=Count('oprava',distinct=True,filter=Q(oprava__status=Oprava.STATUS.K_ZANESENI)),
|
||||
k_oprave_cnt=Count('oprava',distinct=True,filter=Q(oprava__status='k_oprave')),
|
||||
opraveno_cnt=Count('oprava',distinct=True,filter=Q(oprava__status='opraveno')),
|
||||
neni_chyba_cnt=Count('oprava',distinct=True,filter=Q(oprava__status='neni_chyba')),
|
||||
k_zaneseni_cnt=Count('oprava',distinct=True,filter=Q(oprava__status='k_zaneseni')),
|
||||
)
|
||||
template_name = 'korektury/seznam.html'
|
||||
|
||||
|
@ -52,15 +58,13 @@ class KorekturySeskupeneListView(KorekturyAktualniListView):
|
|||
### Korektury
|
||||
class KorekturyView(generic.TemplateView):
|
||||
model = Oprava
|
||||
template_name = 'korektury/korekturovatko/htmlstrana.html'
|
||||
|
||||
def setup(self, request, *args, **kwargs):
|
||||
super().setup(request, *args, **kwargs)
|
||||
self.pdf_id = self.kwargs["pdf"]
|
||||
self.pdf = get_object_or_404(KorekturovanePDF, id=self.pdf_id)
|
||||
template_name = 'korektury/opraf.html'
|
||||
form_class = OpravaForm
|
||||
|
||||
def post(self, request, *args, **kwargs):
|
||||
form = self.form_class(request.POST)
|
||||
q = request.POST
|
||||
scroll = q.get('scroll')
|
||||
|
||||
# prirazeni autora podle prihlaseni
|
||||
autor_user = request.user
|
||||
|
@ -69,27 +73,50 @@ class KorekturyView(generic.TemplateView):
|
|||
if not autor:
|
||||
return HttpResponseForbidden()
|
||||
|
||||
if not scroll:
|
||||
scroll = 0
|
||||
|
||||
action = q.get('action')
|
||||
if (action == ''): # Přidej
|
||||
x = int(q.get('x'))
|
||||
y = int(q.get('y'))
|
||||
text = q.get('txt')
|
||||
strana = int(q.get('img-id')[4:])
|
||||
op = Oprava(x=x,y=y, strana=strana, pdf=self.pdf)
|
||||
pdf = KorekturovanePDF.objects.get(id=q.get('pdf'))
|
||||
|
||||
op = Oprava(x=x,y=y, autor=autor, text=text, strana=strana,pdf = pdf)
|
||||
op.save()
|
||||
kom = Komentar(oprava=op,autor=autor,text=text)
|
||||
kom.save()
|
||||
send_email_notification_komentar(op, autor, request)
|
||||
self.send_email_notification_komentar(op,autor)
|
||||
elif (action == 'del'):
|
||||
id = int(q.get('id'))
|
||||
op = Oprava.objects.get(id=id)
|
||||
for k in Komentar.objects.filter(oprava=op):
|
||||
k.delete()
|
||||
op.delete()
|
||||
elif action in Oprava.STATUS.values:
|
||||
elif (action == 'update'):
|
||||
id = int(q.get('id'))
|
||||
op = Oprava.objects.get(id=id)
|
||||
op.status = action
|
||||
text = q.get('txt')
|
||||
op.autor = autor
|
||||
op.text = text
|
||||
op.save()
|
||||
elif (action == 'undone'):
|
||||
id = int(q.get('id'))
|
||||
op = Oprava.objects.get(id=id)
|
||||
op.status = op.STATUS_K_OPRAVE
|
||||
op.save()
|
||||
elif (action == 'done'):
|
||||
id = int(q.get('id'))
|
||||
op = Oprava.objects.get(id=id)
|
||||
op.status = op.STATUS_OPRAVENO
|
||||
op.save()
|
||||
elif (action == 'ready'):
|
||||
id = int(q.get('id'))
|
||||
op = Oprava.objects.get(id=id)
|
||||
op.status = op.STATUS_K_ZANESENI
|
||||
op.save()
|
||||
elif (action == 'wontfix'):
|
||||
id = int(q.get('id'))
|
||||
op = Oprava.objects.get(id=id)
|
||||
op.status = op.STATUS_NENI_CHYBA
|
||||
op.save()
|
||||
elif (action == 'comment'):
|
||||
id = int(q.get('id'))
|
||||
|
@ -97,7 +124,7 @@ class KorekturyView(generic.TemplateView):
|
|||
text = q.get('txt')
|
||||
kom = Komentar(oprava=op,autor=autor,text=text)
|
||||
kom.save()
|
||||
send_email_notification_komentar(op, autor, request)
|
||||
self.send_email_notification_komentar(op,autor)
|
||||
elif (action == 'update-comment'):
|
||||
id = int(q.get('id'))
|
||||
kom = Komentar.objects.get(id=id)
|
||||
|
@ -110,23 +137,85 @@ class KorekturyView(generic.TemplateView):
|
|||
kom = Komentar.objects.get(id=id)
|
||||
kom.delete()
|
||||
elif (action == 'set-state'):
|
||||
status = q.get('state')
|
||||
assert status in KorekturovanePDF.STATUS.values
|
||||
self.pdf.status = status
|
||||
self.pdf.save()
|
||||
pdf = KorekturovanePDF.objects.get(id=q.get('pdf'))
|
||||
if (q.get('state') == 'adding'):
|
||||
pdf.status = pdf.STATUS_PRIDAVANI
|
||||
elif (q.get('state') == 'comitting'):
|
||||
pdf.status = pdf.STATUS_ZANASENI
|
||||
elif (q.get('state') == 'deprecated'):
|
||||
pdf.status = pdf.STATUS_ZASTARALE
|
||||
pdf.save()
|
||||
context = self.get_context_data()
|
||||
context['scroll'] = scroll
|
||||
context['autor'] = autor
|
||||
return render(request, 'korektury/korekturovatko/htmlstrana.html', context)
|
||||
return render(request, 'korektury/opraf.html',context)
|
||||
|
||||
def send_email_notification_komentar(self, oprava, autor):
|
||||
''' Rozesle e-mail pri pridani komentare / opravy,
|
||||
ktery obsahuje text vlakna opravy.
|
||||
'''
|
||||
|
||||
# parametry e-mailu
|
||||
#odkaz = "https://mam.mff.cuni.cz/korektury/{}/".format(oprava.pdf.pk)
|
||||
from django.urls import reverse
|
||||
odkaz = self.request.build_absolute_uri(reverse('korektury', kwargs={'pdf': oprava.pdf.pk}))
|
||||
odkaz = f"{odkaz}#op{oprava.id}-pointer"
|
||||
from_email = 'korekturovatko@mam.mff.cuni.cz'
|
||||
subject = 'Nová korektura od {} v {}'.format(autor, oprava.pdf.nazev)
|
||||
texty = [(oprava.autor.osoba.plne_jmeno(),oprava.text)]
|
||||
for kom in Komentar.objects.filter(oprava=oprava):
|
||||
texty.append((kom.autor.osoba.plne_jmeno(),kom.text))
|
||||
optext = "\n\n\n".join([": ".join(t) for t in texty])
|
||||
text = u"Text komentáře:\n\n{}\n\n=== Konec textu komentáře ===\n\
|
||||
\nodkaz do korekturovátka: {}\n\
|
||||
\nVaše korekturovátko\n".format(optext, odkaz)
|
||||
|
||||
# Prijemci e-mailu
|
||||
emails = set()
|
||||
# e-mail autora korektury
|
||||
email = oprava.autor.osoba.email
|
||||
if email:
|
||||
emails.add(email)
|
||||
|
||||
# nalezeni e-mailu na autory komentaru
|
||||
for komentar in oprava.komentar_set.all():
|
||||
email_komentujiciho = komentar.autor.osoba.email
|
||||
if email_komentujiciho:
|
||||
emails.add(email_komentujiciho)
|
||||
|
||||
# zodpovedni orgove
|
||||
for org in oprava.pdf.orgove.all():
|
||||
email_zobpovedny = org.osoba.email
|
||||
if email_zobpovedny:
|
||||
emails.add(email_zobpovedny)
|
||||
|
||||
# odstran e-mail autora opravy
|
||||
email = autor.osoba.email
|
||||
if email:
|
||||
emails.discard(email)
|
||||
|
||||
EmailMessage(
|
||||
subject=subject,
|
||||
body=text,
|
||||
from_email=from_email,
|
||||
to=list(emails),
|
||||
).send()
|
||||
|
||||
def get_context_data(self, **kwargs):
|
||||
context = super().get_context_data(**kwargs)
|
||||
context['pdf'] = self.pdf
|
||||
context['img_prefix'] = self.pdf.get_prefix()
|
||||
pdf = get_object_or_404(KorekturovanePDF, id=self.kwargs['pdf'])
|
||||
context['pdf'] = pdf
|
||||
context['img_prefix'] = pdf.get_prefix()
|
||||
context['img_path'] = settings.KOREKTURY_IMG_DIR
|
||||
context['img_indexes'] = range(self.pdf.stran)
|
||||
opravy = Oprava.objects.filter(pdf=self.pdf_id)
|
||||
context['img_indexes'] = range(pdf.stran)
|
||||
context['form_oprava'] = OpravaForm()
|
||||
opravy = Oprava.objects.filter(pdf=self.kwargs['pdf'])
|
||||
zasluhy = {}
|
||||
for o in opravy:
|
||||
if o.autor in zasluhy:
|
||||
zasluhy[o.autor]+=1
|
||||
else:
|
||||
zasluhy[o.autor]=1
|
||||
o.komentare = o.komentar_set.all()
|
||||
for k in o.komentare:
|
||||
if k.autor in zasluhy:
|
||||
|
@ -150,7 +239,8 @@ class KorekturyView(generic.TemplateView):
|
|||
|
||||
context['opravy'] = opravy
|
||||
context['zasluhy'] = zasluhy
|
||||
|
||||
context['tagy'] = KorekturaTag.objects.all()
|
||||
return context
|
||||
|
||||
def form_valid(self,form):
|
||||
return super().form_valid(form)
|
||||
|
||||
|
|
|
@ -95,7 +95,7 @@ function safe_checkout_branch {
|
|||
echo >&2 "Změna v $SCRIPT, prosím pullni manuálně"
|
||||
exit 1
|
||||
fi
|
||||
git checkout "$BRANCH" --
|
||||
git checkout "$BRANCH"
|
||||
git pull
|
||||
git clean -f
|
||||
}
|
||||
|
|
|
@ -57,7 +57,6 @@ DOBA_ODHLASENI_PRI_ZASKRTNUTI_NEODHLASOVAT = 365 * 24 * 3600 # rok
|
|||
CSRF_FAILURE_VIEW = 'various.views.csrf.csrf_error'
|
||||
|
||||
# Modules configuration
|
||||
FORM_RENDERER = "django.forms.renderers.DjangoDivFormRenderer"
|
||||
|
||||
AUTHENTICATION_BACKENDS = (
|
||||
'django.contrib.auth.backends.ModelBackend',
|
||||
|
@ -129,15 +128,12 @@ INSTALLED_APPS = (
|
|||
'rest_framework',
|
||||
'rest_framework.authtoken',
|
||||
|
||||
'colorfield',
|
||||
|
||||
# MaMweb
|
||||
'mamweb',
|
||||
'seminar',
|
||||
'tvorba',
|
||||
'galerie',
|
||||
'korektury',
|
||||
'korektury.api',
|
||||
'prednasky',
|
||||
'header_fotky',
|
||||
'various',
|
||||
|
@ -152,6 +148,7 @@ INSTALLED_APPS = (
|
|||
'vyroci',
|
||||
'sifrovacka',
|
||||
'novinky',
|
||||
'framadate',
|
||||
|
||||
# Admin upravy:
|
||||
|
||||
|
|
|
@ -1,3 +0,0 @@
|
|||
.add-related, .delete-related, .change-related {
|
||||
display: none;
|
||||
}
|
|
@ -435,7 +435,6 @@ body.localweb, body.testweb, body.suprodweb {
|
|||
height: 100%;
|
||||
top: 0;
|
||||
z-index: -1000;
|
||||
opacity: 0.7;
|
||||
}
|
||||
|
||||
&:before { left: 0; }
|
||||
|
|
|
@ -503,10 +503,5 @@ label[for=id_skola] {
|
|||
font-weight: bold;
|
||||
}
|
||||
|
||||
/* Přednášky */
|
||||
.textznalosti, .textprednasky {
|
||||
font-style: italic;
|
||||
}
|
||||
|
||||
/*******************/
|
||||
|
||||
|
|
|
@ -1,20 +0,0 @@
|
|||
/**** ROZLIŠENÍ MEZI LOKÁLNÍM, TESTOVACÍM A PRODUKČNÍM WEBEM ****/
|
||||
body.localweb, body.testweb, body.suprodweb {
|
||||
&:before, &:after {
|
||||
content: "";
|
||||
position: fixed;
|
||||
width: 20px;
|
||||
height: 100%;
|
||||
top: 0;
|
||||
z-index: -1000;
|
||||
opacity: 0.7;
|
||||
}
|
||||
|
||||
&:before { left: 0; }
|
||||
&:after { right: 0; }
|
||||
}
|
||||
|
||||
body.localweb { &:before, &:after { background: greenyellow; } }
|
||||
body.testweb { &:before, &:after { background: darkorange; } }
|
||||
body.suprodweb { &:before, &:after { background: red; } }
|
||||
/****************************************************************/
|
|
@ -5,7 +5,6 @@
|
|||
<link rel="shortcut icon" href="{% static 'favicon.ico' %}" type="image/x-icon">
|
||||
<script src="{% static 'js/jquery-1.11.1.js' %}"></script>
|
||||
<link href="{% static 'css/rozliseni.css' %}?version=1" rel="stylesheet">
|
||||
<link href="{% static 'css/admin.css' %}?version=1" rel="stylesheet">
|
||||
{% endblock %}
|
||||
|
||||
{% block bodyclass %}{{ LOCAL_TEST_PROD }}web{% endblock %}
|
||||
|
|
|
@ -62,6 +62,9 @@ urlpatterns = [
|
|||
|
||||
# Miniapka na šifrovačku
|
||||
path('sifrovacka/', include('sifrovacka.urls')),
|
||||
|
||||
# Framadate
|
||||
path('', include('framadate.urls')),
|
||||
]
|
||||
|
||||
# This is only needed when using runserver.
|
||||
|
|
|
@ -13,3 +13,4 @@ from soustredeni.models import *
|
|||
from treenode.models import *
|
||||
from tvorba.models import *
|
||||
from various.models import *
|
||||
from framadate.models import *
|
||||
|
|
|
@ -322,26 +322,14 @@ def hodnoceniReseniView(request, pk, *args, **kwargs):
|
|||
**form.cleaned_data,
|
||||
)
|
||||
logger.info(f"Creating Hodnoceni: {hodnoceni}")
|
||||
# FIXME následující kód má velmi vysokou šanci se rozbít, vymyslet, jak to udělat jinak
|
||||
zmeny_bodu = [it for it in form.changed_data if it.startswith("body")]
|
||||
if len(zmeny_bodu) != 0:
|
||||
body_nastaveny: None | tuple[str, object] = None
|
||||
def nastav_body(jake, na_kolik):
|
||||
nonlocal body_nastaveny
|
||||
if body_nastaveny is not None:
|
||||
logger.warning(f"Hodnocení {hodnoceni} s id {hodnoceni.id} k řešení {reseni.id} mělo mít nastavené kromě {body_nastaveny[0]} na {body_nastaveny[1]} ještě další body: {jake} na {na_kolik}. Nastavuji -0.1.")
|
||||
if len(zmeny_bodu) == 1:
|
||||
hodnoceni.__setattr__(zmeny_bodu[0], data_for_body[zmeny_bodu[0]])
|
||||
# > jedna změna je špatně, ale 4 "změny" znamenají že nebylo nic zadáno
|
||||
if len(zmeny_bodu) > 1 and len(zmeny_bodu) != 4 and len(zmeny_bodu) != 2:
|
||||
# 4 znamená vše už vyplněno a nic nezměněno, 2 znamená předvyplnili se součty a nic se nezměnilo
|
||||
logger.warning(f"Hodnocení {hodnoceni} mělo mít nastavené víc různých bodů: {zmeny_bodu}. Nastavuji -0.1.")
|
||||
hodnoceni.body = -0.1
|
||||
else:
|
||||
body_nastaveny = (jake, na_kolik)
|
||||
hodnoceni.__setattr__(jake, na_kolik)
|
||||
|
||||
for key, value in data_for_body.items():
|
||||
if key.startswith("body") and value is not None:
|
||||
nastav_body(key, value)
|
||||
|
||||
# Něco se změnilo, ale nic není nastavené = něco bylo smazáno
|
||||
if body_nastaveny is None:
|
||||
hodnoceni.body = None
|
||||
hodnoceni.save()
|
||||
|
||||
adresati = reseni.resitele.filter(upozornovat_na_opravy_reseni=True).values_list('osoba__email', flat=True)
|
||||
|
|
|
@ -1,3 +0,0 @@
|
|||
"""
|
||||
Aplikace umožňující orgům vypisovat si přednášky a účastníkům o nich hlasovat.
|
||||
"""
|
|
@ -4,15 +4,11 @@ from reversion.admin import VersionAdmin
|
|||
from django.utils.safestring import mark_safe
|
||||
from django.utils.html import escape
|
||||
|
||||
from .models import Prednaska, Seznam, Znalost
|
||||
from .models import Prednaska, Seznam, STAV_NAVRH
|
||||
from soustredeni.models import Soustredeni
|
||||
|
||||
|
||||
class Seznam_PrednaskaInline(admin.TabularInline):
|
||||
"""
|
||||
Pomůcka pro :py:class:`prednasky.admin.SeznamAdmin` zobrazující hezky :py:class:`Přednášky <prednasky.models.Prednaska>`
|
||||
v adminu :py:class:`Seznamu <prednasky.models.Seznam>`.
|
||||
"""
|
||||
model = Prednaska.seznamy.through
|
||||
extra = 0
|
||||
|
||||
|
@ -58,57 +54,24 @@ class Seznam_PrednaskaInline(admin.TabularInline):
|
|||
def has_add_permission(self, req, obj): return False
|
||||
|
||||
|
||||
class Seznam_ZnalostInline(admin.TabularInline):
|
||||
"""
|
||||
Pomůcka pro :py:class:`prednasky.admin.SeznamAdmin` zobrazující hezky :py:class:`Znalosti <prednasky.models.Znalost>`
|
||||
v adminu :py:class:`Seznamu <prednasky.models.Seznam>`.
|
||||
"""
|
||||
model = Znalost.seznamy.through
|
||||
extra = 0
|
||||
|
||||
def znalost__nazev(self, obj):
|
||||
return mark_safe(
|
||||
f"<a href='/admin/prednasky/znalost/{obj.znalost.id}'>{obj.znalost.nazev}</a>"
|
||||
)
|
||||
|
||||
def znalost__text(self, obj):
|
||||
return mark_safe(
|
||||
f"<div style='width: 200px'>{escape(obj.znalost.text)}</div>"
|
||||
)
|
||||
|
||||
znalost__nazev.short_description = u'Přednáška'
|
||||
znalost__text.short_description = u'Popis pro orgy'
|
||||
|
||||
readonly_fields = [
|
||||
'znalost__nazev',
|
||||
'znalost__text',
|
||||
]
|
||||
exclude = ['znalost']
|
||||
|
||||
def has_add_permission(self, req, obj): return False
|
||||
|
||||
|
||||
class SeznamAdmin(VersionAdmin):
|
||||
""" Admin pro :py:class:`Seznam <prednasky.models.Seznam>` """
|
||||
list_display = ['soustredeni', 'stav']
|
||||
inlines = [Seznam_PrednaskaInline, Seznam_ZnalostInline]
|
||||
inlines = [Seznam_PrednaskaInline]
|
||||
|
||||
admin.site.register(Seznam, SeznamAdmin)
|
||||
|
||||
|
||||
class PrednaskaAdmin(VersionAdmin):
|
||||
""" Admin pro :py:class:`Přednášku <prednasky.models.Prednaska> """
|
||||
list_display = ['nazev', 'org', 'obor']
|
||||
list_filter = ['org', 'obor']
|
||||
search_fields = ['nazev']
|
||||
search_fields = []
|
||||
filter_horizontal = ('seznamy', )
|
||||
|
||||
actions = ['move_to_soustredeni']
|
||||
|
||||
def move_to_soustredeni(self, request, queryset):
|
||||
""" Přidá dané přednášky do seznamu, o kterém se právě hlasuje """
|
||||
sous = Soustredeni.objects.first()
|
||||
seznam = Seznam.objects.filter(soustredeni=sous, stav=Seznam.Stav.NAVRH)
|
||||
seznam = Seznam.objects.filter(soustredeni=sous, stav=STAV_NAVRH)
|
||||
if len(seznam) == 0:
|
||||
self.message_user(
|
||||
request,
|
||||
|
@ -134,14 +97,3 @@ class PrednaskaAdmin(VersionAdmin):
|
|||
|
||||
|
||||
admin.site.register(Prednaska, PrednaskaAdmin)
|
||||
|
||||
|
||||
class ZnalostAdmin(PrednaskaAdmin): # Trochu hack, ať nemusím vypisovat všechno znovu
|
||||
"""
|
||||
Admin pro :py:class:`Znalost <prednasky.models.Znalost>
|
||||
TODO předělat, aby nedědila z :py:class:`prednasky.admin.PrednaskaAdmin`, ale společné věci byly zvlášť
|
||||
"""
|
||||
list_display = ("__str__",)
|
||||
list_filter = ()
|
||||
|
||||
admin.site.register(Znalost, ZnalostAdmin)
|
||||
|
|
|
@ -1,31 +1,7 @@
|
|||
from django import forms
|
||||
|
||||
from .models import Hlasovani, HlasovaniOZnalostech
|
||||
class NewPrednaskyForm(forms.Form):
|
||||
ucastnik = forms.CharField(label = 'Tvoje jméno', max_length = 100)
|
||||
|
||||
class HlasovaniPrednaskaForm(forms.Form):
|
||||
""" :py:class:`Formulář <django.forms.Form>` pro pro :py:class:`Hlasování <prednasky.models.Hlasovani>` o jedné :py:class:`Přednášce <prednasky.models.Prednaska>`
|
||||
(neobsahuje téměř nic, většina se musí doplnit jiným způsobem)
|
||||
"""
|
||||
|
||||
#: ID :py:class:`Přednášky <prednasky.models.Prednaska>`, o které se hlasuje
|
||||
prednaska_id = forms.IntegerField(widget=forms.HiddenInput)
|
||||
#: :py:class:`Hodnocení (Body) <prednasky.models.Hlasovani.Body>` této přednášky
|
||||
body = forms.ChoiceField(label=False, widget=forms.RadioSelect, choices=Hlasovani.Body.choices, initial=Hlasovani.Body.JEDNO)
|
||||
|
||||
#: Množina formulářů (:py:class:`formset <django.forms.formsets.BaseFormSet>` :py:class:`HlasovaniPrednaskaFormů <prednasky.forms.HlasovaniPrednaskaForm>`)
|
||||
#: pro :py:class:`Hlasování <prednasky.models.Hlasovani>` o množině :py:class:`Přednášek <prednasky.models.Prednaska>`
|
||||
HlasovaniPrednaskaFormSet = forms.formset_factory(HlasovaniPrednaskaForm, extra=0)
|
||||
|
||||
class HlasovaniZnalostiForm(forms.Form):
|
||||
""" :py:class:`Formulář <django.forms.Form>` pro pro :py:class:`HlasováníOZnalostech <prednasky.models.HlasovaniOZnalostech>` o jedné :py:class:`Znalosti <prednasky.models.Znalost>`
|
||||
(neobsahuje téměř nic, většina se musí doplnit jiným způsobem)
|
||||
"""
|
||||
|
||||
#: ID :py:class:`Znalosti <prednasky.models.Znalost>`, o které hlasujeme
|
||||
znalost_id = forms.IntegerField(widget=forms.HiddenInput)
|
||||
#: :py:class:`Odpověď <prednasky.models.HlasovaniOZnalostech.Odpoved>` na tuto znalost
|
||||
odpoved = forms.ChoiceField(label=False, widget=forms.RadioSelect, choices=HlasovaniOZnalostech.Odpoved.choices)
|
||||
|
||||
#: Množina formulářů (:py:class:`formset <django.forms.formsets.BaseFormSet>` :py:class:`HlasovaniZnalostiFormů <prednasky.forms.HlasovaniZnalostiForm>`)
|
||||
#: pro :py:class:`HlasováníOZnalostech <prednasky.models.HlasovaniOZnalostech>` o množině :py:class:`Znalostí <prednasky.models.Znalost>`
|
||||
HlasovaniZnalostiFormSet = forms.formset_factory(HlasovaniZnalostiForm, extra=0)
|
||||
|
|
|
@ -1,39 +0,0 @@
|
|||
# Generated by Django 4.2.16 on 2025-01-24 13:41
|
||||
|
||||
from django.db import migrations, models
|
||||
import django.db.models.deletion
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('personalni', '0019_rename_upozorneni_resitel_upozornovat_na_opravy_reseni'),
|
||||
('prednasky', '0018_post_split_soustredeni'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.CreateModel(
|
||||
name='Znalost',
|
||||
fields=[
|
||||
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
||||
('nazev', models.CharField(help_text='Např. Neuronové sítě', max_length=200, verbose_name='Nadpis')),
|
||||
('text', models.TextField(blank=True, help_text='Např. Perceptron, vrstevnatá síť, forward a backward propagation', null=True, verbose_name='Detailní popis')),
|
||||
('seznamy', models.ManyToManyField(to='prednasky.seznam')),
|
||||
],
|
||||
options={
|
||||
'verbose_name': 'Znalost k přednáškám',
|
||||
'verbose_name_plural': 'Znalosti k přednáškám',
|
||||
'db_table': 'prednasky_znalost',
|
||||
},
|
||||
),
|
||||
migrations.CreateModel(
|
||||
name='HlasovaniOZnalostech',
|
||||
fields=[
|
||||
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
||||
('odpoved', models.CharField(choices=[(-1, 'Tohle celkem umím'), (0, 'Už jsem o tom slyšel, ale neřekl bychm, že to úplně umím'), (1, 'Tohle vůbec neznám')], max_length=16, verbose_name='odpověď')),
|
||||
('seznam', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='prednasky.seznam')),
|
||||
('ucastnik', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='personalni.osoba')),
|
||||
('znalost', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='prednasky.znalost')),
|
||||
],
|
||||
),
|
||||
]
|
|
@ -1,18 +0,0 @@
|
|||
# Generated by Django 4.2.16 on 2025-01-24 20:04
|
||||
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('prednasky', '0019_znalost_hlasovanioznalostech'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AlterField(
|
||||
model_name='hlasovani',
|
||||
name='body',
|
||||
field=models.IntegerField(choices=[(-1, 'rozhodně nechci'), (0, 'je mi to jedno'), (1, 'rozhodně chci')], default=0, verbose_name='Body'),
|
||||
),
|
||||
]
|
|
@ -1,24 +0,0 @@
|
|||
# Generated by Django 4.2.16 on 2025-02-04 20:09
|
||||
|
||||
from django.db import migrations, models
|
||||
|
||||
def zmena_bodu(apps, _schema_editor):
|
||||
HlasovaniOZnalostech = apps.get_model('prednasky','HlasovaniOZnalostech')
|
||||
for h in HlasovaniOZnalostech.objects.all():
|
||||
h.odpoved = -int(h.odpoved)
|
||||
h.save()
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('prednasky', '0020_alter_hlasovani_body'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AlterField(
|
||||
model_name='hlasovanioznalostech',
|
||||
name='odpoved',
|
||||
field=models.IntegerField(choices=[(1, 'Tohle celkem umím'), (0, 'Už jsem o tom slyšel, ale neřekl bychm, že to úplně umím'), (-1, 'Tohle vůbec neznám')], verbose_name='odpověď'),
|
||||
),
|
||||
migrations.RunPython(zmena_bodu, reverse_code=zmena_bodu),
|
||||
]
|
|
@ -1,18 +0,0 @@
|
|||
# Generated by Django 4.2.16 on 2025-02-09 21:10
|
||||
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('prednasky', '0021_alter_hlasovanioznalostech_odpoved'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AlterField(
|
||||
model_name='hlasovanioznalostech',
|
||||
name='odpoved',
|
||||
field=models.IntegerField(choices=[(1, 'Tohle celkem umím'), (0, 'Už jsem o tom slyšel, ale neřekl bych, že to úplně umím'), (-1, 'Tohle vůbec neznám')], verbose_name='odpověď'),
|
||||
),
|
||||
]
|
|
@ -1,134 +1,81 @@
|
|||
from django.db import models
|
||||
|
||||
from soustredeni.models import Soustredeni
|
||||
from personalni.models import Organizator, Osoba
|
||||
from personalni.models import Organizator
|
||||
|
||||
STAV_NAVRH = 1
|
||||
STAV_BUDE = 2
|
||||
|
||||
|
||||
STAV_CHOICES = (
|
||||
(STAV_NAVRH, 'Návrh'),
|
||||
(STAV_BUDE, 'Bude')
|
||||
)
|
||||
|
||||
|
||||
class Seznam(models.Model):
|
||||
"""
|
||||
Spojuje :py:class:`Přednášky <prednasky.models.Prednaska>`
|
||||
se :py:class:`Soustředěními <soustredeni.models.Soustredeni>`,
|
||||
kde by mohly zaznít, nebo zazní/zazněly.
|
||||
"""
|
||||
|
||||
class Meta:
|
||||
db_table = "prednasky_seznam"
|
||||
verbose_name = "Seznam přednášek"
|
||||
verbose_name_plural = "Seznamy přednášek"
|
||||
ordering = ["soustredeni", "stav"]
|
||||
|
||||
class Stav(models.IntegerChoices):
|
||||
""" Stav seznamu přednášek (NAVRH se používá k hlasování viz :py:func:`daný view <prednasky.views.newPrednaska>`). """
|
||||
NAVRH = 1, "Návrh"
|
||||
BUDE = 2, "Bude"
|
||||
db_table = 'prednasky_seznam'
|
||||
verbose_name = 'Seznam přednášek'
|
||||
verbose_name_plural = 'Seznamy přednášek'
|
||||
ordering = ['soustredeni', 'stav']
|
||||
|
||||
id = models.AutoField(primary_key = True)
|
||||
soustredeni = models.ForeignKey(Soustredeni, null=True, default=None, on_delete=models.PROTECT)
|
||||
stav = models.IntegerField("Stav", choices=Stav.choices, default=Stav.NAVRH) #: :py:class:`Stav <prednasky.models.Seznam.Stav>` Seznamu
|
||||
soustredeni = models.ForeignKey(Soustredeni,null = True, default = None,
|
||||
on_delete=models.PROTECT)
|
||||
stav = models.IntegerField('Stav',choices=STAV_CHOICES,default = STAV_NAVRH)
|
||||
|
||||
def __str__(self):
|
||||
return f"Seznam {'návrhů ' if self.stav == Seznam.Stav.NAVRH else ''}přednášek na {self.soustredeni}"
|
||||
return "Seznam {}přednášek na {}".format("návrhů "
|
||||
if self.stav == STAV_NAVRH else "", self.soustredeni)
|
||||
|
||||
|
||||
CHOICES_OBTIZNOST = (
|
||||
(1, 'Lehká'),
|
||||
(2, 'Střední'),
|
||||
(3, 'Těžká'),
|
||||
)
|
||||
|
||||
CHOICES_BODY = (
|
||||
(-1, '-1'),
|
||||
(0, '0'),
|
||||
(1, '1'),
|
||||
)
|
||||
|
||||
class Prednaska(models.Model):
|
||||
"""
|
||||
Reprezentuje přednášku, kterou si org může vypsat a účastník o ní hlasovat.
|
||||
(Viz :py:class:`Hlasování <prednasky.models.Hlasovani>`.)
|
||||
"""
|
||||
class Meta:
|
||||
db_table = "prednasky_prednaska"
|
||||
verbose_name = "Přednáška"
|
||||
verbose_name_plural = "Přednášky"
|
||||
ordering = ["org", "nazev"]
|
||||
|
||||
class Obtiznost(models.IntegerChoices):
|
||||
LEHKA = 1, "Lehká"
|
||||
STREDNI = 2, "Střední"
|
||||
TEZKA = 3, "Těžká"
|
||||
db_table = 'prednasky_prednaska'
|
||||
verbose_name = 'Přednáška'
|
||||
verbose_name_plural = 'Přednášky'
|
||||
ordering = ['org', 'nazev']
|
||||
|
||||
id = models.AutoField(primary_key = True)
|
||||
nazev = models.CharField("Název", max_length=300)
|
||||
nazev = models.CharField('Název', max_length = 300)
|
||||
org = models.ForeignKey(Organizator, on_delete=models.PROTECT)
|
||||
popis = models.TextField("Popis pro orgy", null=True, blank=True, help_text="Neveřejný popis pro ostatní orgy")
|
||||
anotace = models.TextField("Anotace", null=True, blank=True, help_text="Veřejná anotace v hlasování")
|
||||
obtiznost = models.IntegerField("Obtížnost", choices=Obtiznost.choices) #: :py:class:`Obtížnost <prednasky.models.Prednaska.Obtiznost>` Přednášky
|
||||
obor = models.CharField("Obor", max_length=5, help_text="Podmnožina MFIOB")
|
||||
klicova = models.CharField("Klíčová slova", max_length=200, null=True, blank=True)
|
||||
popis = models.TextField('Popis pro orgy',null = True, blank = True,help_text = 'Neveřejný popis pro ostatní orgy')
|
||||
anotace = models.TextField('Anotace',null = True, blank = True, help_text = 'Veřejná anotace v hlasování')
|
||||
obtiznost = models.IntegerField('Obtížnost', choices=CHOICES_OBTIZNOST)
|
||||
obor = models.CharField('Obor', max_length = 5, help_text = 'Podmnožina MFIOB')
|
||||
klicova = models.CharField('Klíčová slova', max_length = 200, null = True, blank = True)
|
||||
seznamy = models.ManyToManyField(Seznam)
|
||||
|
||||
def __str__(self):
|
||||
return f"{self.nazev} ({self.org})"
|
||||
return "{} ({})".format(self.nazev, self.org)
|
||||
|
||||
|
||||
class Hlasovani(models.Model):
|
||||
"""
|
||||
Reprezentuje hlasování jednoho účastníka
|
||||
o jedné :py:class:`Přednášce <prednasky.models.Prednaska>`
|
||||
v jednom :py:class:`Seznamu <prednasky.models.Seznam>` (účastníkův pohled se totiž mezi sousy změnit)
|
||||
"""
|
||||
class Meta:
|
||||
db_table = "prednasky_hlasovani"
|
||||
verbose_name = "Hlasování"
|
||||
verbose_name_plural = "Hlasování"
|
||||
ordering = ["ucastnik", "prednaska"]
|
||||
|
||||
class Body(models.IntegerChoices):
|
||||
""" Ohodnocení přednášky v daném Hlasování (větší číslo = víc chci) """
|
||||
NECHCI = -1, "rozhodně nechci"
|
||||
JEDNO = 0, "je mi to jedno"
|
||||
CHCI = 1, "rozhodně chci"
|
||||
|
||||
db_table = 'prednasky_hlasovani'
|
||||
verbose_name = 'Hlasování'
|
||||
verbose_name_plural = 'Hlasování'
|
||||
ordering = ['ucastnik', 'prednaska']
|
||||
id = models.AutoField(primary_key = True)
|
||||
prednaska = models.ForeignKey(Prednaska, on_delete=models.CASCADE)
|
||||
#: Příslušné hlasování: :py:class:`Body <prednasky.models.Hlasovani.Body>`
|
||||
body = models.IntegerField("Body", default=Body.JEDNO, choices=Body.choices)
|
||||
|
||||
#: Účastník, který hlasoval. Pouze string:
|
||||
#: *(přechod z jména na objekt Osoby nějak kape na tom,
|
||||
#: že všechna předchozí hlasování zde mají náhodný string…)
|
||||
#: TODO Změnit to na Osobu*
|
||||
ucastnik = models.CharField("Účastník", max_length=100)
|
||||
body = models.IntegerField('Body', default = 0, choices = CHOICES_BODY)
|
||||
ucastnik = models.CharField('Účastník', max_length = 100)
|
||||
seznam = models.ForeignKey(Seznam,null=True,on_delete=models.SET_NULL)
|
||||
|
||||
def __str__(self):
|
||||
return f"{self.ucastnik} dal {self.body} bodů {self.prednaska} v seznamu {self.seznam}"
|
||||
|
||||
|
||||
class Znalost(models.Model):
|
||||
"""
|
||||
Reprezentuje znalost, na kterou se můžeme účastníka ptát (nechat je hlasovat).
|
||||
(Viz :py:class:`HlasováníOZnalostech <prednasky.models.HlasovaniOZnalostech>`.)
|
||||
"""
|
||||
class Meta:
|
||||
db_table = "prednasky_znalost"
|
||||
verbose_name = "Znalost k přednáškám"
|
||||
verbose_name_plural = "Znalosti k přednáškám"
|
||||
|
||||
nazev = models.CharField("Nadpis", max_length=200, blank=False, null=False, help_text="Např. Neuronové sítě")
|
||||
text = models.TextField("Detailní popis", blank=True, null=True, help_text="Např. Perceptron, vrstevnatá síť, forward a backward propagation")
|
||||
seznamy = models.ManyToManyField(Seznam)
|
||||
|
||||
def __str__(self):
|
||||
return self.nazev
|
||||
|
||||
|
||||
class HlasovaniOZnalostech(models.Model):
|
||||
"""
|
||||
Reprezentuje hlasování jednoho účastníka
|
||||
o jedné :py:class:`Znalosti <prednasky.models.Znalost>`
|
||||
v jednom :py:class:`Seznamu <prednasky.models.Seznam>` (účastníkův pohled se totiž mezi sousy změnit)
|
||||
"""
|
||||
class Odpoved(models.IntegerChoices):
|
||||
""" Na kolik danou znalost účastník ovládá v daném Hlasování (větší číslo = víc zná) """
|
||||
UMIM = 1, "Tohle celkem umím"
|
||||
CIRCA = 0, "Už jsem o tom slyšel, ale neřekl bych, že to úplně umím"
|
||||
NEUMIM = -1, "Tohle vůbec neznám"
|
||||
|
||||
odpoved = models.IntegerField(u"odpověď", choices=Odpoved.choices, blank=False, null=False) #: :py:class:`Odpověď <prednasky.models.Prednaska.Odpoved>` na HlasováníOZnalostech
|
||||
znalost = models.ForeignKey(Znalost, on_delete=models.CASCADE, blank=False, null=False)
|
||||
ucastnik = models.ForeignKey(Osoba, on_delete=models.CASCADE, blank=False, null=False)
|
||||
seznam = models.ForeignKey(Seznam, on_delete=models.SET_NULL, blank=True, null=True)
|
||||
|
||||
def __str__(self):
|
||||
return f"{self.ucastnik} dal {self.znalost} bodů {self.znalost} v seznamu {self.seznam}"
|
||||
return "{} dal {} bodů {} v seznamu {}".format(self.ucastnik,
|
||||
self.body, self.prednaska, self.seznam)
|
||||
|
||||
|
|
|
@ -5,36 +5,36 @@
|
|||
|
||||
|
||||
{% block content %}
|
||||
<h1>{% block nadpis1a %}Hlasování o přednáškách{% endblock %}</h1>
|
||||
<h1>
|
||||
{% block nadpis1a %}Hlasování o přednáškách{% endblock %}
|
||||
</h1>
|
||||
|
||||
<p>
|
||||
Jak moc by ses chtěl(a) zúčastnit následujících přednášek?
|
||||
<br>
|
||||
<span style="font-size: 75%">Obtížnost 1 je nejlehčí, 3 nejtěžší.</span>
|
||||
</p>
|
||||
|
||||
<form enctype="multipart/form-data" action="." method="post">
|
||||
{% csrf_token %}
|
||||
|
||||
<h3>Jak moc by ses chtěl(a) zúčastnit následujících přednášek?</h3>
|
||||
<p>Obtížnost 1 je nejlehčí, 3 nejtěžší.</p>
|
||||
{{ form_set_prednasky.management_form }}
|
||||
{% for f, p in formy_a_prednasky %}
|
||||
<h4>{{p.nazev}} ({{p.org}})</h4>
|
||||
<p class="textprednasky">{{p.anotace | linebreaksbr}}</p>
|
||||
<label>Obor: </label> {{p.obor}}<br>
|
||||
<label>Obtížnost: </label> {{p.obtiznost}}<br>
|
||||
{% if p.klicova %}<label>Klíčová slova: </label> {{p.klicova}}<br>{% endif%}
|
||||
<br>
|
||||
{{ f }}
|
||||
<br>
|
||||
<table>
|
||||
{% for p, h in prednasky %}
|
||||
<tr><td><label>{{p.org}}: <span style="font-size: 175%">{{p.nazev}}</span></label></td></tr>
|
||||
<tr><td><p><i>{{p.anotace}}</i></p></td></tr>
|
||||
<tr><td><label>Obor: </label> {{p.obor}}</td></tr>
|
||||
<tr><td><label>Obtížnost: </label> {{p.obtiznost}}</td> </tr>
|
||||
{% if p.klicova %}<tr><td><label>Klíčová slova: </label> {{p.klicova}}</td></tr>{% endif%}
|
||||
<tr><td>Hodnocení:
|
||||
<INPUT TYPE="radio" NAME="q{{p.pk}}" VALUE="-1" {% if h == -1 %} CHECKED="checked" {% endif %} > rozhodně nechci
|
||||
<INPUT TYPE="radio" NAME="q{{p.pk}}" VALUE="0" {% if h == 0 %} CHECKED="checked" {% endif %}> je mi to jedno
|
||||
<INPUT TYPE="radio" NAME="q{{p.pk}}" VALUE="1" {% if h == 1 %} CHECKED="checked" {% endif %}> rozhodně chci
|
||||
</td></tr>
|
||||
<tr><td> </td></tr>
|
||||
{% empty %}
|
||||
Nejsou žádné přednášky o kterých by šlo hlasovat.
|
||||
{% endfor %}
|
||||
|
||||
{{ form_set_znalosti.management_form }}
|
||||
{% for f, z in formy_a_znalosti %}
|
||||
{% if forloop.first %}<hr/><h3>Jak moc znáš následující?</h3>{% endif %}
|
||||
<h4>{{z.nazev}}</h4>
|
||||
<p class="textznalosti">{{z.text | linebreaksbr}}</p>
|
||||
{{ f }}
|
||||
<br>
|
||||
{% endfor %}
|
||||
<input type="submit" value="Odeslat"/>
|
||||
<tr><td><input name="odeslat" type="submit" value="Odeslat"></td><tr>
|
||||
</table>
|
||||
</form>
|
||||
|
||||
{% endblock %}
|
||||
|
|
|
@ -14,7 +14,7 @@
|
|||
{% else %}
|
||||
<a href="/prednasky/seznam_prednasek/{{seznam.id}}">Seznam přednášek na soustředění {{seznam.soustredeni.misto}} </a>
|
||||
{% endif %}
|
||||
<a href="/prednasky/seznam_prednasek/{{seznam.id}}/hlasovani.csv">Export</a>
|
||||
<a href="/prednasky/seznam_prednasek/{{seznam.id}}/export">Export</a>
|
||||
</li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
|
|
|
@ -12,15 +12,10 @@ urlpatterns = [
|
|||
'prednasky/metaseznam_prednasek',
|
||||
org_required(views.MetaSeznamListView.as_view()),
|
||||
name='metaseznam-list'),
|
||||
# path(
|
||||
# 'prednasky/seznam_prednasek/<int:seznam>/export',
|
||||
# org_required(views.SeznamExportView),
|
||||
# name='seznam-export'
|
||||
# ),
|
||||
path(
|
||||
'prednasky/seznam_prednasek/<int:seznam>/hlasovani.csv',
|
||||
org_required(views.PrednaskyExportView),
|
||||
name='seznam-export-csv'
|
||||
'prednasky/seznam_prednasek/<int:seznam>/export',
|
||||
org_required(views.SeznamExportView),
|
||||
name='seznam-export'
|
||||
),
|
||||
path(
|
||||
'prednasky/seznam_prednasek/<int:seznam>/',
|
||||
|
|
|
@ -1,142 +1,77 @@
|
|||
import csv
|
||||
import http
|
||||
import logging
|
||||
|
||||
from django.http import HttpResponse, HttpRequest
|
||||
from django.shortcuts import render, get_object_or_404
|
||||
from django.views import generic
|
||||
from django.shortcuts import HttpResponseRedirect
|
||||
from django.core.exceptions import ObjectDoesNotExist
|
||||
from django.db import transaction
|
||||
from django.db.models import Sum
|
||||
from django.forms import Form
|
||||
|
||||
from various.views.pomocne import formularOKView
|
||||
from .forms import HlasovaniPrednaskaFormSet, HlasovaniZnalostiFormSet
|
||||
|
||||
from various.models import Nastaveni
|
||||
from prednasky.models import Prednaska, Hlasovani, Znalost, HlasovaniOZnalostech, Seznam
|
||||
from prednasky.models import Prednaska, Hlasovani, Seznam, STAV_NAVRH
|
||||
from soustredeni.models import Soustredeni
|
||||
from personalni.models import Osoba
|
||||
|
||||
PREDNASKY_PREFIX = "prednasky"
|
||||
ZNALOSTI_PREFIX = "znalosti"
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
def newPrednaska(request: HttpRequest) -> HttpResponse:
|
||||
"""
|
||||
View zobrazující a ukládající účastnické hlasování
|
||||
(:py:class:`Hlasování <prednasky.models.Hlasovani>`
|
||||
a :py:class:`HlasováníOZnalostech <prednasky.models.HlasovaniOZnalostech>`)
|
||||
o :py:class:`Přednáškách <prednasky.models.Prednaska>`
|
||||
a :py:class:`Znalostech <prednasky.models.Znalost>`
|
||||
"""
|
||||
def newPrednaska(request):
|
||||
# hlasovani se vztahuje k nejnovejsimu soustredeni
|
||||
sous = Nastaveni.get_solo().aktualni_sous
|
||||
seznam = Seznam.objects.filter(soustredeni = sous, stav=Seznam.Stav.NAVRH).first()
|
||||
seznam = Seznam.objects.filter(soustredeni = sous, stav = STAV_NAVRH).first()
|
||||
if sous is None or seznam is None:
|
||||
return render(request, 'universal.html', {
|
||||
'title': "Nelze hlasovat",
|
||||
'text': "Není žádný seznam přednášek, o kterém by se dalo hlasovat.",
|
||||
}, status=http.HTTPStatus.NOT_FOUND)
|
||||
|
||||
osoba = Osoba.objects.filter(user=request.user).first()
|
||||
ucastnik = osoba.plne_jmeno() + ' ' + str(osoba.id) # id, kvůli kolizi jmen
|
||||
ucastnik = osoba.plne_jmeno() + ' ' + str(osoba.id)
|
||||
# obsluha formulare
|
||||
if request.method == 'POST':
|
||||
form = Form(request.POST, request.FILES)
|
||||
if form.is_valid():
|
||||
# id z důvodu duplicitních jmen (přechod z jména na objekt Osoby nějak kape na tom,
|
||||
# že všechna předchozí hlasování zde mají náhodný string…)
|
||||
# TODO Změnit to na Osobu
|
||||
|
||||
if request.method == 'POST': # Když to byl POST, tak ukládáme.
|
||||
# Načteme data do formsetů
|
||||
form_set_prednasky = HlasovaniPrednaskaFormSet(request.POST, prefix=PREDNASKY_PREFIX)
|
||||
form_set_znalosti = HlasovaniZnalostiFormSet(request.POST, prefix=ZNALOSTI_PREFIX)
|
||||
|
||||
if form_set_prednasky.is_valid() and form_set_znalosti.is_valid():
|
||||
with transaction.atomic():
|
||||
# Místo updatování data prostě smažeme a vytvoříme nová
|
||||
seznam.hlasovani_set.filter(ucastnik=ucastnik).delete()
|
||||
seznam.hlasovanioznalostech_set.filter(ucastnik=osoba).delete()
|
||||
|
||||
for form in form_set_prednasky:
|
||||
prednaska_id = form.cleaned_data['prednaska_id']
|
||||
prednaska = Prednaska.objects.filter(id=prednaska_id).first()
|
||||
if prednaska is None:
|
||||
logger.error(f"Účastník {ucastnik} hodnotil neexistující přednášku {prednaska_id} číslem {form.cleaned_data['body']}")
|
||||
continue
|
||||
|
||||
Hlasovani.objects.create(
|
||||
prednaska=prednaska,
|
||||
body=form.cleaned_data['body'],
|
||||
ucastnik=ucastnik,
|
||||
seznam=seznam,
|
||||
)
|
||||
|
||||
for form in form_set_znalosti:
|
||||
znalost_id = form.cleaned_data['znalost_id']
|
||||
znalost = Znalost.objects.filter(id=znalost_id).first()
|
||||
if znalost is None:
|
||||
logger.error(f"Účastník {ucastnik} hodnotil neexistující znalost {znalost_id} číslem {form.cleaned_data['odpoved']}")
|
||||
continue
|
||||
|
||||
HlasovaniOZnalostech.objects.create(
|
||||
odpoved=form.cleaned_data['odpoved'],
|
||||
znalost=znalost,
|
||||
ucastnik=osoba,
|
||||
seznam=seznam,
|
||||
)
|
||||
# TODO v následujících řádcích je zbytečně mnoho dotazů na QuerySet (pokud účastník hlasoval, hlasoval u všech)
|
||||
for i in request.POST:
|
||||
if i[0] == 'q':
|
||||
prednaska = Prednaska.objects.filter(pk=int(i[1:]))[0]
|
||||
hlasovani = Hlasovani.objects.filter(ucastnik=ucastnik, prednaska=prednaska).first()
|
||||
if not hlasovani:
|
||||
hlasovani = Hlasovani()
|
||||
hlasovani.prednaska = prednaska
|
||||
hlasovani.ucastnik = ucastnik
|
||||
hlasovani.seznam = seznam
|
||||
hlasovani.body = int(request.POST[i])
|
||||
hlasovani.save()
|
||||
|
||||
# presmerovani na prave vzniklou galerii
|
||||
return HttpResponseRedirect('./hotovo')
|
||||
|
||||
else: # Pokud je nějaký formset nevalidní, vracíme je k přepracování
|
||||
prednasky = seznam.prednaska_set.all()
|
||||
znalosti = seznam.znalost_set.all()
|
||||
# FIXME Spadnout, pokud nesedí přednáška/znalost s formulářem. (Nějak se mi to nepovedlo.)
|
||||
# Může se totiž stát, že se mezitím změnily přednášky (nějaká byla přidána/odebrána)
|
||||
def prednaska_hodnoceni(prednaska):
|
||||
h = Hlasovani.objects.filter(ucastnik=ucastnik, prednaska=prednaska).first()
|
||||
if h:
|
||||
return prednaska, h.body
|
||||
else:
|
||||
return prednaska, 0
|
||||
|
||||
else: # Když to nebyl POST, tak inicializujeme (pokud už o přednášce/znalosti účastník hlasoval, předvyplníme mu to).
|
||||
def odpoved_prednasky(p: Prednaska) -> Hlasovani.Body:
|
||||
hlasovani = p.hlasovani_set.filter(ucastnik=ucastnik).first()
|
||||
return hlasovani.body if hlasovani else Hlasovani.Body.JEDNO
|
||||
|
||||
def odpoved_znalosti(z: Znalost) -> HlasovaniOZnalostech.Odpoved:
|
||||
hlasovani = z.hlasovanioznalostech_set.filter(ucastnik=osoba).first()
|
||||
return hlasovani.odpoved if hlasovani else HlasovaniOZnalostech.Odpoved.CIRCA
|
||||
|
||||
prednasky = seznam.prednaska_set.all()
|
||||
znalosti = seznam.znalost_set.all()
|
||||
|
||||
form_set_prednasky = HlasovaniPrednaskaFormSet(initial=[
|
||||
{"prednaska_id": p.id, "body": odpoved_prednasky(p)} for p in prednasky
|
||||
], prefix=PREDNASKY_PREFIX)
|
||||
|
||||
form_set_znalosti = HlasovaniZnalostiFormSet(initial=[
|
||||
{"znalost_id": z.id, "odpoved": odpoved_znalosti(z)} for z in znalosti
|
||||
], prefix=ZNALOSTI_PREFIX)
|
||||
|
||||
|
||||
# V případě nePOSTu nebo chyby při ukládání vracíme hlasování
|
||||
return render(
|
||||
request,
|
||||
'prednasky/base.html',
|
||||
{
|
||||
'form_set_prednasky': form_set_prednasky, 'form_set_znalosti': form_set_znalosti,
|
||||
'formy_a_prednasky': zip(form_set_prednasky, prednasky),
|
||||
'formy_a_znalosti': zip(form_set_znalosti, znalosti),
|
||||
}
|
||||
{'prednasky': map(prednaska_hodnoceni, seznam.prednaska_set.all())}
|
||||
)
|
||||
|
||||
|
||||
def Prednaska_hotovo(request: HttpRequest) -> HttpResponse:
|
||||
""" View po vyplnění :py:func:`hlasování <prednasky.views.newPrednaska>` """
|
||||
def Prednaska_hotovo(request):
|
||||
return formularOKView(request, "Děkujeme za vyplnění hlasování o přednáškách a těšíme se na soustředění.")
|
||||
|
||||
class MetaSeznamListView(generic.ListView):
|
||||
""" Seznam všech :py:class:`Seznamů <prednasky.models.Seznam>` s odkazy na exporty """
|
||||
model = Seznam
|
||||
template_name = 'prednasky/metaseznam_prednasek.html'
|
||||
|
||||
|
||||
class SeznamListView(generic.ListView):
|
||||
"""
|
||||
Náhled na to, kolik má která přednáška v :py:class:`Seznamu <prednasky.models.Seznam>` :py:class:`hlasů <prednasky.models.Hlasovani.Body>`.
|
||||
(Je otázka, zda tento View vůbec chceme. Pokud ano, hodilo by se do něj přidat i znalosti.)
|
||||
"""
|
||||
template_name = 'prednasky/seznam_prednasek.html'
|
||||
|
||||
def get_queryset(self):
|
||||
|
@ -152,7 +87,7 @@ class SeznamListView(generic.ListView):
|
|||
|
||||
# hlasovani se vztahuje k nejnovejsimu soustredeni
|
||||
sous = Soustredeni.objects.first()
|
||||
seznam = Seznam.objects.filter(soustredeni = sous, stav=Seznam.Stav.NAVRH).first()
|
||||
seznam = Seznam.objects.filter(soustredeni = sous, stav = STAV_NAVRH).first()
|
||||
|
||||
for obj in self.object_list:
|
||||
hlasovani_set = obj.hlasovani_set.filter(seznam=seznam).only('body')
|
||||
|
@ -161,86 +96,32 @@ class SeznamListView(generic.ListView):
|
|||
return context
|
||||
|
||||
|
||||
# def SeznamExportView(request, seznam):
|
||||
# """Vypíše výsledky hlasování ve formátu pro prologovský optimalizátor"""
|
||||
# # TODO zřejmě se nepoužívá, časem vyřadit? nahradit tabulkou vhodnější pro
|
||||
# # lidi?
|
||||
# hlasovani = Hlasovani.objects.filter(seznam=seznam)
|
||||
# prednasky = Prednaska.objects.filter(seznamy=seznam)
|
||||
# orgove = set(p.org for p in prednasky)
|
||||
# ucastnici = set(h.ucastnik for h in hlasovani)
|
||||
#
|
||||
# for p in prednasky:
|
||||
# p.body = []
|
||||
# for u in ucastnici:
|
||||
# try:
|
||||
# p.body.append(hlasovani.get(ucastnik=u, prednaska=p).body)
|
||||
# except ObjectDoesNotExist:
|
||||
# # účastník nehlasoval
|
||||
# p.body.append("?")
|
||||
#
|
||||
# for h in hlasovani:
|
||||
# h.ucastnik = hash(h.ucastnik)
|
||||
#
|
||||
# return render(
|
||||
# request,
|
||||
# 'prednasky/seznam_prednasek_export.txt',
|
||||
# {"hlasovani": hlasovani, "prednasky": prednasky, "orgove": orgove},
|
||||
# content_type="text/plain"
|
||||
# )
|
||||
def SeznamExportView(request, seznam):
|
||||
"""Vypíše výsledky hlasování ve formátu pro prologovský optimalizátor"""
|
||||
# TODO zřejmě se nepoužívá, časem vyřadit? nahradit tabulkou vhodnější pro
|
||||
# lidi?
|
||||
hlasovani = Hlasovani.objects.filter(seznam=seznam)
|
||||
prednasky = Prednaska.objects.filter(seznamy=seznam)
|
||||
orgove = set(p.org for p in prednasky)
|
||||
ucastnici = set(h.ucastnik for h in hlasovani)
|
||||
|
||||
|
||||
def PrednaskyExportView(request: HttpRequest, seznam: int, **kwargs) -> HttpResponse:
|
||||
"""
|
||||
Vrátí všechna :py:class:`Hlasování <prednasky.models.Hlasovani>`
|
||||
i :py:class:`HlasováníOZnalostech <prednasky.models.HlasovaniOZnalostech>`
|
||||
v daném :py:class:`Seznamu <prednasky.models.Seznam>`
|
||||
jako csv soubor (řádky = účastníci, sloupce = přednášky&znalosti).
|
||||
|
||||
:param seznam: ID daného :py:class:`Seznamu <prednasky.models.Seznam>`
|
||||
"""
|
||||
hlasovani = Hlasovani.objects.filter(seznam=seznam).select_related("prednaska")
|
||||
hlasovani_o_znalostech = HlasovaniOZnalostech.objects.filter(seznam=seznam).select_related('ucastnik', 'znalost')
|
||||
|
||||
# Inicializujeme sloupce
|
||||
prednasky = list(Prednaska.objects.filter(seznamy=seznam))
|
||||
znalosti = list(Znalost.objects.filter(seznamy=seznam))
|
||||
|
||||
prednasky_map: dict[int, int] = {p.id: i for i, p in enumerate(prednasky, 1)}
|
||||
offset = len(prednasky_map)
|
||||
znalosti_map: dict[int, int] = {z.id: i for i, z in enumerate(znalosti, offset + 1)}
|
||||
width = offset + len(znalosti_map)
|
||||
|
||||
# A po inicializaci sloupců vyplníme tabulku
|
||||
table: [str, list[str|Prednaska|Znalost,]] = {}
|
||||
for p in prednasky:
|
||||
p.body = []
|
||||
for u in ucastnici:
|
||||
try:
|
||||
p.body.append(hlasovani.get(ucastnik=u, prednaska=p).body)
|
||||
except ObjectDoesNotExist:
|
||||
# účastník nehlasoval
|
||||
p.body.append("?")
|
||||
|
||||
for h in hlasovani:
|
||||
if h.ucastnik not in table: # Pokud jsme účastníka ještě neviděli, předgenerujeme si jeho řádek
|
||||
table[h.ucastnik] = [h.ucastnik] + ([""] * width)
|
||||
h.ucastnik = hash(h.ucastnik)
|
||||
|
||||
if h.prednaska.id in prednasky_map:
|
||||
table[h.ucastnik][prednasky_map[h.prednaska.id]] = h.body
|
||||
else:
|
||||
pass # TODO Padat hlasitě?
|
||||
|
||||
for h in hlasovani_o_znalostech:
|
||||
ucastnik = str(h.ucastnik) + ' ' + str(h.ucastnik.id) # id, kvůli kolizi jmen
|
||||
if ucastnik not in table: # Pokud jsme účastníka ještě neviděli, předgenerujeme si jeho řádek
|
||||
table[ucastnik] = [ucastnik] + ([""] * width)
|
||||
|
||||
if h.znalost.id in znalosti_map:
|
||||
table[ucastnik][znalosti_map[h.znalost.id]] = h.odpoved
|
||||
else:
|
||||
pass # TODO Padat hlasitě?
|
||||
|
||||
|
||||
response = HttpResponse(content_type="text/csv", charset="utf-8")
|
||||
response["Content-Disposition"] = 'attachment; filename="hlasovani.csv"'
|
||||
|
||||
writer = csv.writer(response)
|
||||
writer.writerow(["jména \\ přednáška|znalost"] + list(map(str, prednasky + znalosti)))
|
||||
for row in table.values():
|
||||
writer.writerow(list(map(str, row)))
|
||||
return response
|
||||
return render(
|
||||
request,
|
||||
'prednasky/seznam_prednasek_export.txt',
|
||||
{"hlasovani": hlasovani, "prednasky": prednasky, "orgove": orgove},
|
||||
content_type="text/plain"
|
||||
)
|
||||
|
||||
|
||||
|
|
|
@ -17,7 +17,7 @@ django-solo # Singleton model (speciálně Nastavení)
|
|||
django-ckeditor-5 # Editor htmlka (hlavně v adminu u flatpages)
|
||||
django-cleanup # Uklízí media/ od smazaných „databázových“ souborů
|
||||
django-taggit # Taggy v djangu (speciálně zaměření problémů)
|
||||
django-autocomplete-light>=3.9.0,<3.12.0 # Automatické doplňování (problémů, účastníků, …) ve formulářích
|
||||
django-autocomplete-light>=3.9.0 # Automatické doplňování (problémů, účastníků, …) ve formulářích
|
||||
django-imagekit # Všechny možné obrázky v Djangu
|
||||
django-polymorphic # Polymorfismus na django modelech (hlavně Problém nebo treenode)
|
||||
django-sitetree # Struktura stránek, hlavně pro meníčko
|
||||
|
@ -25,7 +25,6 @@ django_reverse_admin # Lepší handlování OneToOne fieldů v adminu
|
|||
django-rest-framework
|
||||
django-webpack-loader
|
||||
django-rest-polymorphic
|
||||
django-colorfield # Field pro ukládání barvy (např. tagy v korekturovátku)
|
||||
|
||||
# debug tools/extensions
|
||||
|
||||
|
@ -50,5 +49,4 @@ lorem
|
|||
|
||||
sphinx
|
||||
sphinx_rtd_theme
|
||||
sphinxcontrib-django
|
||||
myst_parser
|
||||
|
|
|
@ -27,7 +27,7 @@ class HromadnePridaniForm(Form):
|
|||
""" Formulář pro hromadné přidání úložek a problémů """
|
||||
|
||||
tema = CharField(label="Název tématu:")
|
||||
cislo = IntegerField(label="Číslo:", min_value=1)
|
||||
dil = IntegerField(label="Díl:", min_value=1)
|
||||
body = CharField(label="Počty bodů (0 pro problém) oddělené čárkami:")
|
||||
|
||||
def clean_tema(self):
|
||||
|
@ -41,7 +41,7 @@ class HromadnePridaniForm(Form):
|
|||
def clean_body(self):
|
||||
""" Kontrola, že `body` je seznam čísel """
|
||||
try:
|
||||
list(map(float, self.cleaned_data["body"].split(",")))
|
||||
list(map(int, self.cleaned_data["body"].split(",")))
|
||||
except ValueError:
|
||||
raise ValidationError("Špatný formát bodů")
|
||||
return self.cleaned_data['body']
|
||||
|
@ -64,21 +64,21 @@ class HromadnePridaniView(FormView):
|
|||
""" Upravený Pavlův skript na hromadné přidání úložek a problémů. """
|
||||
cd = form.cleaned_data
|
||||
tema = cd["tema"]
|
||||
cislo = cd["cislo"]
|
||||
body = list(map(float, cd["body"].split(",")))
|
||||
dil = cd["dil"]
|
||||
body = list(map(int, cd["body"].split(",")))
|
||||
|
||||
t = Problem.objects.get(nazev__exact=tema, nadproblem=None)
|
||||
with transaction.atomic():
|
||||
pfx = f"{t.nazev}, "
|
||||
pfx = f"{t.nazev}, díl {dil}, "
|
||||
|
||||
for k, b in enumerate(body, 1):
|
||||
u = Uloha.objects.create(
|
||||
nadproblem=t,
|
||||
nazev=pfx + f"{'úloha' if b > 0 else 'problém'} {cislo}.{k}",
|
||||
nazev=pfx + f"{'úloha' if b > 0 else 'problém'} {k}",
|
||||
autor=t.autor,
|
||||
garant=t.garant,
|
||||
max_body=b,
|
||||
cislo_zadani=Cislo.get(t.rocnik.rocnik, cislo),
|
||||
cislo_zadani=Cislo.get(t.rocnik.rocnik, dil),
|
||||
kod=k,
|
||||
stav=Problem.STAV_ZADANY,
|
||||
)
|
||||
|
|
Loading…
Reference in a new issue