V models.py pridana funkce rocnik - urci rocnik resitele.
Pouzito ve views.py (pridano jako promenna RadkuVysledkovky). Bylo by dobre otestovat korektnost!!! Na testovacich datech to vypada rozumne, ale neoverovala jsem do detailu. Anet
This commit is contained in:
		
							parent
							
								
									455df020b3
								
							
						
					
					
						commit
						bd16b0db9e
					
				
					 2 changed files with 13 additions and 2 deletions
				
			
		|  | @ -210,6 +210,16 @@ class Resitel(SeminarModelBase): | |||
|                 'school-name': str(self.skola) if self.skola else 'Skola neni znama', | ||||
|             } | ||||
| 
 | ||||
|     def rocnik(self, datum): | ||||
| 		"Vypise skolni rocnik resitele pro zadane datum typu datetime." | ||||
| 		rozdil = self.rok_maturity - datum.year | ||||
| 		if datum.month < 9: | ||||
| 			return 4 - rozdil | ||||
| 		else: | ||||
| 			return 5 - rozdil | ||||
| 
 | ||||
| 	#def titul(self): | ||||
| 
 | ||||
| 
 | ||||
| @reversion.register(ignore_duplicate_revisions=True) | ||||
| @python_2_unicode_compatible | ||||
|  |  | |||
|  | @ -90,12 +90,13 @@ class CisloView(generic.DetailView): | |||
|         vysledkovka = [] | ||||
|         posledni_body = 100000 | ||||
|         predchozi_poradi = None | ||||
|         body_minule = None  | ||||
|         body_minule = None | ||||
| 
 | ||||
|         for vi in range(len(vysledky)): | ||||
|             v = vysledky[vi] | ||||
|             tv = RadekVysledkovky() | ||||
|             tv.resitel = v.resitel | ||||
|             tv.resitel = v.resitel   | ||||
|             tv.rocnik = tv.resitel.rocnik(context['cislo'].datum_vydani) | ||||
|             tv.vysledek = v | ||||
|             #odkazuje na VysledkyKCislu | ||||
|             tv.body = ['']*len(problemy) | ||||
|  |  | |||
		Loading…
	
		Reference in a new issue
	
	 Aneta
						Aneta