Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

Draft na HTML #5

Open
wants to merge 37 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
579885c
Pridany drafty na login, loga a CSS
KosiehBarter Feb 21, 2016
c46bfc2
Proveden squash
KosiehBarter Feb 21, 2016
9af90b6
Minifix: Docasne vyrazen user_mgmt (neni v urls)
KosiehBarter Feb 28, 2016
3ee6fb4
Pridan dialog na spravu vozidel - WIP
KosiehBarter Feb 28, 2016
548260f
Pridany formulare
KosiehBarter Mar 1, 2016
5ec246d
Minoritni opravy
KosiehBarter Mar 1, 2016
f626b30
Pridan canvas pro zobrazeni barvy
KosiehBarter Mar 1, 2016
a7cb683
Hardcodovane hrefy predelany na for z renderu
KosiehBarter Mar 1, 2016
7358ca1
Predelan nadpis pro multilang support
KosiehBarter Mar 1, 2016
d04f9ee
Predelan nadpis pro multilang support
KosiehBarter Mar 1, 2016
39ffc8f
Pridana podpora a override pro prihlaseni mailem
KosiehBarter Mar 1, 2016
70d5af3
Prejmenovan z car_mgmt a pridana podpora pro mazani
KosiehBarter Mar 1, 2016
46c0d25
Koncept pro upravu uziv nastaveni
KosiehBarter Mar 1, 2016
48240dd
Opravy pro stavajici veci a pridany nove
KosiehBarter Mar 1, 2016
0555f64
Vymazano url na tvorbu spolujizdy (not assigned)
KosiehBarter Mar 1, 2016
bf70993
Opraveno pro splneni PEP8
KosiehBarter Mar 1, 2016
8c57966
Commit pred rozdelenim
KosiehBarter Mar 5, 2016
4ecbb63
Pridany drafty na login, loga a CSS
KosiehBarter Feb 21, 2016
0b378bd
Proveden squash
KosiehBarter Feb 21, 2016
36be8f5
Minifix: Docasne vyrazen user_mgmt (neni v urls)
KosiehBarter Feb 28, 2016
964a5fd
Pridan dialog na spravu vozidel - WIP
KosiehBarter Feb 28, 2016
79c0310
Pridany formulare
KosiehBarter Mar 1, 2016
788daba
Hardcodovane hrefy predelany na for z renderu
KosiehBarter Mar 1, 2016
71c6b7e
Majoritni zmeny, viz komentar
KosiehBarter Mar 1, 2016
889d71e
Opravy pro stavajici veci a pridany nove
KosiehBarter Mar 1, 2016
7582389
Vymazano url na tvorbu spolujizdy (not assigned)
KosiehBarter Mar 1, 2016
2a49589
Pridana informace o externim repu na emailusernames
KosiehBarter Mar 1, 2016
4aaa039
Opraveno pro splneni PEP8
KosiehBarter Mar 1, 2016
97100c0
Opraveno pro splneni PEP8
KosiehBarter Mar 1, 2016
5fb4eef
Commit pred rozdelenim
KosiehBarter Mar 5, 2016
853baa9
Commit pred rozdelenim
KosiehBarter Mar 5, 2016
dfbe2ac
Commit pred rebasem
KosiehBarter Mar 6, 2016
4a18a6e
Odstraneni nepotrebnosti a commit pred rebasem
KosiehBarter Mar 6, 2016
b395dbf
Rozdeleno: nastaveni uzivatele a profil
KosiehBarter Mar 6, 2016
965a9b7
Vymazan chybny odkaz na models
KosiehBarter Mar 6, 2016
1c9d0dc
Migrace na lepsi system views
KosiehBarter Mar 6, 2016
7b88fc2
Commit po rebase z master
KosiehBarter Mar 8, 2016
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,15 @@ Rozpracováno (částečně funguje):

Chybí, je třeba opravit (hmm.. od čeho začít :)
* plnění webu day prozatím pouze skrze administraci (viz. link výše)

* front-end, design
* hodnocení jízd
* poptávky jízd
* (a všechno ostatní ...)

* (skrze administraci) lze přihlásit pasažéra i na trasu mimo jeho jízdu - toto budeme stejně ošetřovat už při vkládání do DB, takže to nakonec tak moc vadit nebude
* všechno ostatní ...

## Zavislosti
* je potreba rucne doinstalovat emailusernames, pip nefunguje (nevim proc)
* https://github.com/harmo/django-email-as-username
1 change: 1 addition & 0 deletions apps/web/admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
admin.site.register(models.Comment)
admin.site.register(models.Waypoint)
admin.site.register(models.Passanger)
admin.site.register(models.Vehicle)
admin.site.register(models.JourneyWaypoints)


Expand Down
56 changes: 56 additions & 0 deletions apps/web/forms.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
from django import forms

from . import models

from random import randint
from . import models
from django.utils.translation import ugettext_lazy as _


class SearchJourney(forms.Form):
Expand All @@ -25,6 +30,7 @@ class Meta:
wpt_update_factory_kwargs = dict(wpt_base_factory_kwargs)
wpt_new_factory_kwargs['extra'] = 2


WaypointNewFormSetFactory = forms.inlineformset_factory(
**wpt_new_factory_kwargs)
WaypointUpdateFormSetFactory = forms.inlineformset_factory(
Expand All @@ -36,3 +42,53 @@ class Meta:
model = models.JourneyWaypoints
fields = ['journey', 'waypoint', 'label']
js = ('js/jquery.js',)

class RegisterForm(forms.Form):

def rand_anti_question():
day_list = ["pondělí", "úterý", "středa", "čtvrtek", "pátek", "sobota", "neděle"]

rand_day_num = randint(0, len(day_list))
rand_addition = randint(0, len(day_list))
correct_day_num = rand_day_num + rand_addition
correct_day_index = correct_day_num

if correct_day_index >= len(day_list):
correct_day_index = correct_day_index - len(day_list)

question = "Dnes je %s. V případě, že je toto tvrzení pravdivé, co bude za %s dny?" % (day_list[rand_day_num - 1], rand_addition)
return (question, day_list[correct_day_index - 1])

user_email = forms.CharField(max_length = 100, label = _("Your E-Mail address"))
user_email_confirm = forms.CharField(max_length = 100, label = _("Your E-Mail address - Confirmation"))
user_password = forms.CharField(widget = forms.PasswordInput(), label = _("Your Password"))
user_password_confirm = forms.CharField(widget = forms.PasswordInput(), label = _("Your Password - Confirmation"))

cont_question, correct_day = rand_anti_question()
random_antibot = forms.CharField(max_length = 50, label = cont_question)


class LoginForm(forms.Form):
user_name = forms.EmailField(max_length = 100, label = _("Your email"))
user_pass = forms.CharField(widget = forms.PasswordInput(), label = _("Your Password"))


class ManageForm(forms.Form):
user_mail = forms.EmailField(max_length = 100, label = _("Your E-mail address"))
user_mail_confirm = forms.EmailField(max_length = 100, label = _("Your E-mail address - Confirmation"))
user_pass = forms.CharField(max_length = 100, widget = forms.PasswordInput(), label = _("Your Password"))
user_pass_confirm = forms.EmailField(max_length = 100, widget = forms.PasswordInput(), label = _("Your Password - Confirmation"))
user_phone = forms.CharField(max_length = 20, label = _("Your phone number"))


class CarManageForm(forms.Form):
car_name = forms.CharField(max_length = 20, label = _("Your car brand"))
#color = forms.CharField(max_length = 10, label = _("Your car's color"))

air_conditioning = forms.BooleanField(label = _("Air conditioning in car"))
animals_allowed = forms.BooleanField(label = _("Animal transport is allowed"))
has_wifi = forms.BooleanField(label = _("Wifi is in car"))
has_highway_sign = forms.BooleanField(label = _("Car has a Highway stamp"))
smoking_allowed = forms.BooleanField(label = "Smoking allowed in vehicle")

register_sign = forms.CharField(max_length = 16, label = _("Car national register sign"))
91 changes: 0 additions & 91 deletions apps/web/migrations.old/0001_initial.py

This file was deleted.

36 changes: 0 additions & 36 deletions apps/web/migrations.old/0002_auto_20160211_2320.py

This file was deleted.

21 changes: 0 additions & 21 deletions apps/web/migrations.old/0003_auto_20160211_2321.py

This file was deleted.

49 changes: 0 additions & 49 deletions apps/web/migrations.old/0004_auto_20160212_0905.py

This file was deleted.

25 changes: 0 additions & 25 deletions apps/web/migrations.old/0005_auto_20160212_0907.py

This file was deleted.

36 changes: 0 additions & 36 deletions apps/web/migrations.old/0006_auto_20160212_0921.py

This file was deleted.

20 changes: 0 additions & 20 deletions apps/web/migrations.old/0007_journeywaypoints_partial_price.py

This file was deleted.

Loading