Prodana volitelna verejnost vysledkove listiny
This commit is contained in:
		
							parent
							
								
									2a89e03a9e
								
							
						
					
					
						commit
						3838b207f9
					
				
					 4 changed files with 35 additions and 1 deletions
				
			
		|  | @ -177,10 +177,11 @@ admin.site.register(Skola, SkolaAdmin) | |||
| 
 | ||||
| class CisloAdmin(reversion.VersionAdmin): | ||||
|     fieldsets = [ | ||||
|         (None,              {'fields': ['cislo', 'rocnik', 'verejne_db', 'poznamka']}), | ||||
|         (None,              {'fields': ['cislo', 'rocnik', 'verejne_db', 'verejna_vysledkovka', 'poznamka']}), | ||||
|         (u'Data',           {'fields': ['datum_vydani', 'datum_deadline']}), | ||||
|         ] | ||||
|     list_display = ['kod', 'rocnik', 'cislo', 'datum_vydani', 'datum_deadline', 'verejne'] | ||||
|     list_display = ['kod', 'rocnik', 'cislo', 'datum_vydani', 'datum_deadline', 'verejna_vysledkovka'] | ||||
|     list_filter = ['rocnik'] | ||||
|     view_on_site = Cislo.verejne_url | ||||
|     def get_queryset(self, request): | ||||
|  |  | |||
							
								
								
									
										20
									
								
								seminar/migrations/0021_cislo_verejna_vysledkovka.py
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										20
									
								
								seminar/migrations/0021_cislo_verejna_vysledkovka.py
									
									
									
									
									
										Normal file
									
								
							|  | @ -0,0 +1,20 @@ | |||
| # -*- coding: utf-8 -*- | ||||
| from __future__ import unicode_literals | ||||
| 
 | ||||
| from django.db import models, migrations | ||||
| 
 | ||||
| 
 | ||||
| class Migration(migrations.Migration): | ||||
| 
 | ||||
|     dependencies = [ | ||||
|         ('seminar', '0020_indexy_a_razeni'), | ||||
|     ] | ||||
| 
 | ||||
|     operations = [ | ||||
|         migrations.AddField( | ||||
|             model_name='cislo', | ||||
|             name='verejna_vysledkovka', | ||||
|             field=models.BooleanField(default=False, help_text='Je-li false u ve\u0159ejn\xe9ho \u010d\xedsla, nen\xed v\xfdsledkovka zat\xedm ve\u0159ejn\xe1.', verbose_name='zve\u0159ejn\u011bna v\xfdsledkovka'), | ||||
|             preserve_default=True, | ||||
|         ), | ||||
|     ] | ||||
|  | @ -262,6 +262,9 @@ class Cislo(SeminarModelBase): | |||
| 
 | ||||
|     verejne_db = models.BooleanField(u'číslo zveřejněno', db_column='verejne', default=False) | ||||
| 
 | ||||
|     verejna_vysledkovka = models.BooleanField(u'zveřejněna výsledkovka', default=False, | ||||
|             help_text=u'Je-li false u veřejného čísla, není výsledkovka zatím veřejná.') | ||||
| 
 | ||||
|     poznamka = models.TextField(u'neveřejná poznámka', blank=True, | ||||
|         help_text=u'Neveřejná poznámka k číslu (plain text)') | ||||
| 
 | ||||
|  |  | |||
|  | @ -20,7 +20,12 @@ | |||
|   {% endfor %} | ||||
|   </ul> | ||||
| 
 | ||||
|   {% if cislo.verejna_vysledkovka %} | ||||
|   <h3>Výsledkovka</h3> | ||||
|   {% else %} | ||||
|   <div class='mam-org-only'> | ||||
|   <h3>Výsledkovka (neveřejná)</h3> | ||||
|   {% endif %} | ||||
| 
 | ||||
|   <table class='vysledkovka'> | ||||
|     <tr class='border-b'> | ||||
|  | @ -44,6 +49,11 @@ | |||
|   {% endfor %} | ||||
|   </table> | ||||
| 
 | ||||
|   {% if cislo.verejna_vysledkovka %} | ||||
|   {% else %} | ||||
|   </div> | ||||
|   {% endif %} | ||||
| 
 | ||||
| </div> | ||||
| {% endblock content %} | ||||
| 
 | ||||
|  |  | |||
		Loading…
	
		Reference in a new issue
	
	 Tomas Gavenciak
						Tomas Gavenciak