From d681d967365652ea5d7d9ef6fa90389ff0a37828 Mon Sep 17 00:00:00 2001 From: Constantin Lungu Date: Mon, 3 Jun 2019 22:55:15 +0300 Subject: [PATCH 1/2] #123 Implement display of row_number parameter for child tasks --- project_template/models.py | 18 ++++++ project_template/task_templates.py | 4 +- project_template/tasks.py | 63 ++++++++----------- project_template/templates/task.html | 2 + .../templates/tasks/owned_buildings_task.html | 2 +- .../tasks/owned_goods_or_services.html | 2 +- ...ned_income_from_deferred_use_of_goods.html | 3 +- .../tasks/owned_income_from_gambling.html | 3 +- .../tasks/owned_income_from_salaries.html | 3 +- 9 files changed, 57 insertions(+), 43 deletions(-) diff --git a/project_template/models.py b/project_template/models.py index 7dc722f..943b593 100644 --- a/project_template/models.py +++ b/project_template/models.py @@ -116,6 +116,7 @@ class OwnedLandTableEntry(CommonInfo): taxable_value_currency = models.CharField("Valuta", max_length=16, choices=Currency.return_as_iterable()) attainment_type = models.CharField("Modul de dobandire", max_length=32, choices=AttainmentType.return_as_iterable(), blank=True) observations = models.CharField("Observatii", max_length=256, blank=True) + row_number = models.IntegerField("Numarul randului introdus din tabel") # Tabel Cladiri - row numbers class OwnedBuildingsTable(models.Model): @@ -135,6 +136,7 @@ class OwnedBuildingsTableEntry(CommonInfo): taxable_value_currency = models.CharField("Valuta", max_length=16, choices=Currency.return_as_iterable()) attainment_type = models.CharField("Modul de dobandire", max_length=32, choices=AttainmentType.return_as_iterable(), blank=True) observations = models.CharField("Observatii", max_length=256, blank=True) + row_number = models.IntegerField("Numarul randului introdus din tabel") # Tabel Bunuri Mobile - row numbers class OwnedAutomobileTable(models.Model): @@ -150,6 +152,7 @@ class OwnedAutomobileTableEntry(models.Model): no_owned = models.PositiveSmallIntegerField("Numar de bucati") fabrication_year = models.IntegerField("Anul de fabricatie") attainment_type = models.CharField("Modul de dobandire", max_length=32, choices=AttainmentType.return_as_iterable()) + row_number = models.IntegerField("Numarul randului introdus din tabel") # Tabel Bunuri Imobile - row numbers class OwnedJewelryTable(models.Model): @@ -164,6 +167,7 @@ class OwnedJewelryTableEntry(models.Model): acquisition_year = models.IntegerField("Anul dobandirii") goods_value = models.IntegerField("Suma") currency = models.CharField("Valuta", max_length=16, choices=Currency.return_as_iterable()) + row_number = models.IntegerField("Numarul randului introdus din tabel") # Tabel Bunuri Mobile Instrainate, Valoare peste 3000EUR - row numbers class OwnedExtraValuableTable(models.Model): @@ -180,6 +184,7 @@ class OwnedExtraValuableTableEntry(CommonInfo): goods_separation_type = models.CharField("Forma instrainarii", max_length=64, choices=GoodsSeparationType.return_as_iterable()) value = models.IntegerField("Valoare") currency = models.CharField("Valuta", max_length=16, choices=Currency.return_as_iterable()) + row_number = models.IntegerField("Numarul randului introdus din tabel") # Tabel Conturi - row numbers class OwnedBankAccountsTable(models.Model): @@ -195,6 +200,7 @@ class OwnedBankAccountsTableEntry(models.Model): currency = models.CharField("Valuta", max_length=16, choices=Currency.return_as_iterable()) opening_year = models.IntegerField("Deschis in anul") account_balance = models.DecimalField("Soldul", decimal_places=2, max_digits=10) + row_number = models.IntegerField("Numarul randului introdus din tabel") # Tabel Plasamente, Investitii - row numbers class OwnedInvestmentsTable(models.Model): @@ -214,6 +220,7 @@ class OwnedInvestmentsTableEntry(models.Model): share_ratio = models.DecimalField("Cota de participare", max_digits=3, decimal_places=2, null=True, blank=True) total_value = models.FloatField("Valoare totala la zi") currency = models.CharField("Valuta", max_length=16, choices=Currency.return_as_iterable()) + row_number = models.IntegerField("Numarul randului introdus din tabel") # Tabel Alte active - row numbers class OtherActivesTable(models.Model): @@ -227,6 +234,7 @@ class OtherActivesTableEntry(models.Model): active_type = models.CharField("Tipul activului", max_length=128) active_value = models.FloatField("Valoarea activului") currency = models.CharField("Valuta", max_length=16, choices=Currency.return_as_iterable()) + row_number = models.IntegerField("Numarul randului introdus din tabel") # Tabel Datorii - row numbers class OwnedDebtsTable(models.Model): @@ -244,6 +252,7 @@ class OwnedDebtsTableEntry(models.Model): due_date = models.IntegerField("Scadent la") value = models.FloatField("Valoare") currency = models.CharField("Valuta", max_length=16, choices=Currency.return_as_iterable()) + row_number = models.IntegerField("Numarul randului introdus din tabel") # Tabel Cadouri Servicii - row number class OwnedGoodsOrServicesTable(models.Model): @@ -254,6 +263,7 @@ class OwnedGoodsOrServicesTable(models.Model): # Tabel Cadouri Servicii - actual row number class OwnedGoodsOrServicesTableEntry(CommonIncomeFields): table = models.ForeignKey(OwnedGoodsOrServicesTable, on_delete=models.CASCADE, null=True) + row_number = models.IntegerField("Numarul randului introdus din tabel") # Tabel Venituri salarii - row number @@ -266,6 +276,7 @@ class OwnedIncomeFromSalariesTable(models.Model): # Tabel Venituri salarii - actual row information class OwnedIncomeFromSalariesTableEntry(CommonIncomeFields): table = models.ForeignKey(OwnedIncomeFromSalariesTable, on_delete=models.CASCADE, null=True) + row_number = models.IntegerField("Numarul randului introdus din tabel") # Tabel Venituri activitati independente - row number @@ -277,6 +288,7 @@ class OwnedIncomeFromIndependentActivitiesTable(models.Model): # Tabel Venituri activitati independente - actual row information class OwnedIncomeFromIndependentActivitiesTableEntry(CommonIncomeFields): table = models.ForeignKey(OwnedIncomeFromIndependentActivitiesTable, on_delete=models.CASCADE, null=True) + row_number = models.IntegerField("Numarul randului introdus din tabel") # Tabel Venituri cedarea folosintei bunurilor - row number class OwnedIncomeFromDeferredUseOfGoodsTable(models.Model): @@ -287,6 +299,7 @@ class OwnedIncomeFromDeferredUseOfGoodsTable(models.Model): # Tabel Venituri cedarea folosintei bunurilor - actual row information class OwnedIncomeFromDeferredUseOfGoodsTableEntry(CommonIncomeFields): table = models.ForeignKey(OwnedIncomeFromDeferredUseOfGoodsTable, on_delete=models.CASCADE, null=True) + row_number = models.IntegerField("Numarul randului introdus din tabel") # Tabel Venituri investitii - row number class OwnedIncomeFromInvestmentsTable(models.Model): @@ -297,6 +310,7 @@ class OwnedIncomeFromInvestmentsTable(models.Model): # Tabel Venituri investitii - actual row information class OwnedIncomeFromInvestmentsTableEntry(CommonIncomeFields): table = models.ForeignKey(OwnedIncomeFromInvestmentsTable, on_delete=models.CASCADE, null=True) + row_number = models.IntegerField("Numarul randului introdus din tabel") # Tabel Venituri pensii - row number class OwnedIncomeFromPensionsTable(models.Model): @@ -308,6 +322,7 @@ class OwnedIncomeFromPensionsTable(models.Model): class OwnedIncomeFromPensionsTableEntry(CommonIncomeFields): table = models.ForeignKey(OwnedIncomeFromPensionsTable, on_delete=models.CASCADE, null=True) ex_position = models.CharField("Pozitia detinuta", max_length=128) + row_number = models.IntegerField("Numarul randului introdus din tabel") # Tabel Venituri activitati agricole - row number class OwnedIncomeFromAgriculturalActivitiesTable(models.Model): @@ -318,6 +333,7 @@ class OwnedIncomeFromAgriculturalActivitiesTable(models.Model): # Tabel Venituri activitati agricole - actual row information class OwnedIncomeFromAgriculturalActivitiesTableEntry(CommonIncomeFields): table = models.ForeignKey(OwnedIncomeFromAgriculturalActivitiesTable, on_delete=models.CASCADE, null=True) + row_number = models.IntegerField("Numarul randului introdus din tabel") # Tabel Venituri premii jocuri noroc - row numbers class OwnedIncomeFromGamblingTable(models.Model): @@ -328,6 +344,7 @@ class OwnedIncomeFromGamblingTable(models.Model): # Tabel Venituri premii jocuri noroc - actual row information class OwnedIncomeFromGamblingTableEntry(CommonIncomeFields): table = models.ForeignKey(OwnedIncomeFromGamblingTable, on_delete=models.CASCADE, null=True) + row_number = models.IntegerField("Numarul randului introdus din tabel") # Tabel Venituri din alte surse - row numbers class OwnedIncomeFromOtherSourcesTable(models.Model): @@ -338,3 +355,4 @@ class OwnedIncomeFromOtherSourcesTable(models.Model): # Tabel Venituri din alte surse - actual row information class OwnedIncomeFromOtherSourcesTableEntry(CommonIncomeFields): table = models.ForeignKey(OwnedIncomeFromOtherSourcesTable, on_delete=models.CASCADE, null=True) + row_number = models.IntegerField("Numarul randului introdus din tabel") diff --git a/project_template/task_templates.py b/project_template/task_templates.py index 2852abf..30b5073 100644 --- a/project_template/task_templates.py +++ b/project_template/task_templates.py @@ -12,6 +12,8 @@ class DigitalizationTask(AbstractTask): def create_new_task(self, task, info): from moonsheep.register import base_task + for k in info: + setattr(task, k, info[k]) base_task.register(task) def create_mocked_task(self, task_data): @@ -38,5 +40,5 @@ def save_verified_data(self, verified_data): def after_save(self, verified_data): # Create a new task for each table, asking the user to transcribe the number of rows number_rows = int(verified_data['count']) - for row_number in list(range(1, number_rows)): + for row_number in range(1, number_rows + 1): self.create_new_task(self.child_class, {'row_number': row_number}) \ No newline at end of file diff --git a/project_template/tasks.py b/project_template/tasks.py index 0682388..b3fd68b 100644 --- a/project_template/tasks.py +++ b/project_template/tasks.py @@ -7,7 +7,6 @@ import project_template.forms as forms from project_template.task_templates import DigitalizationTask, CountTableRowsTask - class TaskGetInitialInformation(DigitalizationTask): task_form = forms.TranscribeInitialInformation template_name = 'tasks/general_information_task.html' @@ -52,17 +51,16 @@ def save_verified_data(self, verified_data): taxable_value=verified_data['taxable_value'], taxable_value_currency=verified_data['taxable_value_currency'], attainment_type=verified_data['attainment_type'], - observations=verified_data.get('observations', '') + observations=verified_data.get('observations', ''), + row_number=self.row_number if hasattr(self, 'row_number') else -1 ) -@register() class TaskOwnedLandTable(CountTableRowsTask): task_form = forms.TranscribeOwnedLandTable storage_model = models.OwnedLandTable child_class = TaskOwnedLandRowEntry - class TaskOwnedAutomobileRowEntry(DigitalizationTask): task_form = forms.TranscribeOwnedAutomobileSingleRowEntry template_name = "tasks/owned_automobile.html" @@ -74,15 +72,14 @@ def save_verified_data(self, verified_data): no_owned=verified_data['num_of_automobiles'], fabrication_year=verified_data['year_of_manufacture'], attainment_type=verified_data['attainment_type'], + row_number=self.row_number if hasattr(self, 'row_number') else -1 ) - class TaskOwnedAutomobileTable(CountTableRowsTask): task_form = forms.TranscribeOwnedAutomobile storage_model = models.OwnedAutomobileTable child_class = TaskOwnedAutomobileRowEntry - class TaskOwnedBankAccountsRowEntry(DigitalizationTask): task_form = forms.TranscribeOwnedBankAccountsRowEntry template_name = "tasks/owned_bank_accounts.html" @@ -94,15 +91,14 @@ def save_verified_data(self, verified_data): currency=verified_data['currency'], opening_year=verified_data['account_start_date'], account_balance=verified_data['balance'], + row_number=self.row_number if hasattr(self, 'row_number') else -1 ) - class TaskOwnedBankAccountsTable(CountTableRowsTask): task_form = forms.TranscribeOwnedBankAccountsTable storage_model = models.OwnedBankAccountsTable child_class = TaskOwnedBankAccountsRowEntry - class TaskOwnedIncomeFromAgriculturalActivitiesRowEntry(DigitalizationTask): task_form = forms.TranscribeOwnedIncomeFromAgriculturalActivitiesRowEntry template_name = "tasks/agricultural_activity.html" @@ -117,16 +113,15 @@ def save_verified_data(self, verified_data): commune=verified_data['commune'], goods_name=verified_data['offered_service'], annual_income=verified_data['income_amount'], - annual_income_currency=verified_data['currency'] + annual_income_currency=verified_data['currency'], + row_number=self.row_number if hasattr(self, 'row_number') else -1 ) - class TaskOwnedIncomeFromAgriculturalActivitiesTable(CountTableRowsTask): task_form = forms.TranscribeOwnedIncomeFromAgriculturalActivitiesTable storage_model = models.OwnedIncomeFromAgriculturalActivitiesTable child_class = TaskOwnedIncomeFromAgriculturalActivitiesRowEntry - class TaskOwnedDebtsRowEntry(DigitalizationTask): task_form = forms.TranscribeOwnedDebtsSingleRowEntry template_name = "tasks/owned_debts.html" @@ -143,7 +138,8 @@ def save_verified_data(self, verified_data): acquirement_year=verified_data['loan_start_year'], due_date=verified_data['loan_maturity'], value=verified_data['loan_amount'], - currency=verified_data['currency'] + currency=verified_data['currency'], + row_number=self.row_number if hasattr(self, 'row_number') else -1 ) elif verified_data['institution']: owned_debts, created = models.OwnedDebtsTableEntry.objects.get_or_create( @@ -152,16 +148,15 @@ def save_verified_data(self, verified_data): acquirement_year=verified_data['loan_start_year'], due_date=verified_data['loan_maturity'], value=verified_data['loan_amount'], - currency=verified_data['currency'] + currency=verified_data['currency'], + row_number=self.row_number if hasattr(self, 'row_number') else -1 ) - class TaskOwnedDebtsTable(CountTableRowsTask): task_form = forms.TranscribeDebtsTableRowsCount storage_model = models.OwnedDebtsTable child_class = TaskOwnedDebtsRowEntry - class TaskOwnedIncomeFromPensionsRowEntry(DigitalizationTask): task_form = forms.TranscribeOwnedIncomeFromPensionsSingleRowEntry template_name = "tasks/owned_income_from_pensions.html" @@ -180,15 +175,14 @@ def save_verified_data(self, verified_data): service=verified_data['offered_service'], ex_position=verified_data['position'], annual_income=verified_data['income_amount'], - currency=verified_data['currency']) - + currency=verified_data['currency'], + row_number=self.row_number if hasattr(self, 'row_number') else -1) class TaskOwnedIncomeFromPensionsTable(CountTableRowsTask): task_form = forms.TranscribeOwnedIncomeFromPensionsTable storage_model = models.OwnedIncomeFromPensionsTable child_class = TaskOwnedIncomeFromPensionsRowEntry - class TaskOwnedGoodsOrServicesRowEntry(DigitalizationTask): task_form = forms.TranscribeOwnedGoodsOrServicesRowEntry template_name = "tasks/owned_goods_or_services.html" @@ -210,15 +204,14 @@ def save_verified_data(self, verified_data): service=verified_data['service'], annual_income=verified_data['annual_income'], currency=verified_data['currency'], + row_number=self.row_number if hasattr(self, 'row_number') else -1 ) - class TaskOwnedGoodsOrServicesPerSpouseTable(CountTableRowsTask): task_form = forms.TranscribeOwnedGoodsOrServicesTable storage_model = models.OwnedGoodsOrServicesTable child_class = TaskOwnedGoodsOrServicesRowEntry - class TaskTranscribeOwnedInvestmentsTable(CountTableRowsTask): task_form = forms.TranscribeOwnedInvestmentsTable storage_model = models.OwnedInvestmentsTable @@ -242,15 +235,14 @@ def save_verified_data(self, verified_data): service = verified_data['service'], annual_income = verified_data['annual_income'], currency = verified_data['currency'], + row_number=self.row_number if hasattr(self, 'row_number') else -1 ) -@register() class TaskOwnedIncomeFromOtherSourcesTable(CountTableRowsTask): task_form = forms.TranscribeOwnedIncomeFromOtherSourcesTable storage_model = models.OwnedIncomeFromOtherSourcesTable child_class = TaskOwnedIncomeFromOtherSourcesRowEntry - class TaskOwnedJewelryRowEntry(DigitalizationTask): task_form = forms.TranscribeOwnedJewelrySingleRowEntry template_name = "tasks/owned_jewelry.html" @@ -260,15 +252,14 @@ def save_verified_data(self, verified_data): summary_description=verified_data['description'], acquisition_year=verified_data['ownership_start_year'], goods_value=verified_data['estimated_value'], - currency=verified_data['currency']) - + currency=verified_data['currency'], + row_number=self.row_number if hasattr(self, 'row_number') else -1) class TaskOwnedJewelryTable(CountTableRowsTask): task_form = forms.TranscribeOwnedJewelry storage_model = models.OwnedJewelryTable child_class = TaskOwnedJewelryRowEntry - class TaskExtraValuableRowEntry(DigitalizationTask): task_form = forms.TranscribeExtraValuableRowEntry template_name = "tasks/owned_extra_valuable.html" @@ -288,16 +279,15 @@ def save_verified_data(self, verified_data): estrangement_date=verified_data['estranged_date'], goods_separation_type=verified_data['goods_separation_type'], value=verified_data['estimated_value'], - currency=verified_data['currency'] + currency=verified_data['currency'], + row_number=self.row_number if hasattr(self, 'row_number') else -1 ) - class TaskExtraValuableTable(CountTableRowsTask): task_form = forms.TranscribeExtraValuable storage_model = models.OwnedExtraValuableTable child_class = TaskExtraValuableRowEntry - class TaskOwnedIncomeFromDeferredUseOfGoodsRowEntry(DigitalizationTask): task_form = forms.TranscribeOwnedIncomeFromDeferredUseOfGoodsRowEntry template_name = "tasks/owned_income_from_deferred_use_of_goods.html" @@ -319,6 +309,7 @@ def save_verified_data(self, verified_data): service=verified_data['service'], annual_income=verified_data['annual_income'], currency=verified_data['currency'], + row_number=self.row_number if hasattr(self, 'row_number') else -1 ) @@ -327,14 +318,12 @@ class TaskOwnedIncomeFromDeferredUseOfGoodsTable(CountTableRowsTask): storage_model = models.OwnedIncomeFromDeferredUseOfGoodsTable child_class = TaskOwnedIncomeFromDeferredUseOfGoodsRowEntry - class TaskOwnedIncomeFromIndependentActivitiesTable(CountTableRowsTask): task_form = forms.TranscribeIndependentActivities storage_model = models.OwnedIncomeFromIndependentActivitiesTable # TODO - add child_class child_class = None - class TaskOwnedIncomeFromGamblingRowEntry(DigitalizationTask): task_form = forms.TranscribeOwnedIncomeFromGamblingRowEntry template_name = "tasks/owned_income_from_gambling.html" @@ -356,15 +345,14 @@ def save_verified_data(self, verified_data): service=verified_data['service'], annual_income=verified_data['annual_income'], currency=verified_data['currency'], + row_number=self.row_number if hasattr(self, 'row_number') else -1 ) - class TaskOwnedIncomeFromGamblingTable(CountTableRowsTask): task_form = forms.TranscribeOwnedIncomeFromGamblingTable storage_model = models.OwnedIncomeFromGamblingTable child_class = TaskOwnedIncomeFromGamblingRowEntry - class TaskOwnedIncomeFromSalariesRowEntry(DigitalizationTask): task_form = forms.TranscribeOwnedIncomeFromSalariesRowEntry template_name = "tasks/owned_income_from_salaries.html" @@ -386,15 +374,14 @@ def save_verified_data(self, verified_data): service=verified_data['service'], annual_income=verified_data['annual_income'], currency=verified_data['currency'], + row_number=self.row_number if hasattr(self, 'row_number') else -1 ) - class TaskOwnedIncomeFromSalariesTable(CountTableRowsTask): task_form = forms.TranscribeOwnedIncomeFromSalaries storage_model = models.OwnedIncomeFromSalariesTable child_class = TaskOwnedIncomeFromSalariesRowEntry - class TaskOwnedBuildingsRowEntry(DigitalizationTask): task_form = forms.TranscribeOwnedBuildingsTableRowEntry template_name = "tasks/owned_buildings_task.html" @@ -417,7 +404,8 @@ def save_verified_data(self, verified_data): taxable_value=verified_data['taxable_value'], taxable_value_currency=verified_data['taxable_value_currency'], attainment_type=verified_data['attainment_type'], - observations=verified_data.get('observations', '') + observations=verified_data.get('observations', ''), + row_number=self.row_number if hasattr(self, 'row_number') else -1 ) @@ -427,6 +415,7 @@ class TaskOwnedBuildingsTable(CountTableRowsTask): child_class = TaskOwnedBuildingsRowEntry +@register() class TaskOwnedIncomeFromInvestmentsRowEntry(DigitalizationTask): task_form = forms.TranscribeOwnedIncomeFromInvestmentsRowEntry template_name = "tasks/owned_investments.html" @@ -440,10 +429,10 @@ def save_verified_data(self, verified_data): service=verified_data['service'], source_of_goods=verified_data['source_of_goods'], annual_income=verified_data['income_amount'], - currency=verified_data['currency'] + currency=verified_data['currency'], + row_number=self.row_number if hasattr(self, 'row_number') else -1 ) - @register() class TaskOwnedIncomeFromInvestmentsTable(CountTableRowsTask): task_form = forms.TranscribeOwnedIncomeFromInvestmentsTable diff --git a/project_template/templates/task.html b/project_template/templates/task.html index 3b5e16b..3faedef 100644 --- a/project_template/templates/task.html +++ b/project_template/templates/task.html @@ -23,7 +23,9 @@
{# Provide additional context for non-native speakers #} {% if "en" in request.LANGUAGE_CODE %} + {% with row_num=task.row_number %} {% block explanation %}{% endblock %} + {% endwith %} {% endif %} {# Forms incoming! #}
diff --git a/project_template/templates/tasks/owned_buildings_task.html b/project_template/templates/tasks/owned_buildings_task.html index e1058ff..31670ee 100644 --- a/project_template/templates/tasks/owned_buildings_task.html +++ b/project_template/templates/tasks/owned_buildings_task.html @@ -2,7 +2,7 @@ {% block explanation %}
-

Va rugam introduceti informatiile de pe randul {{nr_rand}} completat din tabelul "Bunuri Imobile - Cladiri".

+

Va rugam introduceti informatiile de pe randul {{row_num}} completat din tabelul "Bunuri Imobile - Cladiri".

{% endblock %} diff --git a/project_template/templates/tasks/owned_goods_or_services.html b/project_template/templates/tasks/owned_goods_or_services.html index 41da90f..ae68e81 100644 --- a/project_template/templates/tasks/owned_goods_or_services.html +++ b/project_template/templates/tasks/owned_goods_or_services.html @@ -2,7 +2,7 @@ {% block explanation %}
-

Va rugam introduceti informatiile de pe randul {{nr_rand}} completat din tabelul VI. "Cadouri, servicii".

+

Va rugam introduceti informatiile de pe randul {{row_num}} completat din tabelul VI. "Cadouri, servicii".

{% endblock %} diff --git a/project_template/templates/tasks/owned_income_from_deferred_use_of_goods.html b/project_template/templates/tasks/owned_income_from_deferred_use_of_goods.html index f3ac302..703fffc 100644 --- a/project_template/templates/tasks/owned_income_from_deferred_use_of_goods.html +++ b/project_template/templates/tasks/owned_income_from_deferred_use_of_goods.html @@ -2,7 +2,8 @@ {% block explanation %}
-

Va rugam introduceti informatiile de pe randul {{nr_rand}} completat din tabelul VII. "Venituri ale declarantului si ale membrilor sai de familie - 3. Venituri din cedarea folosintei bunurilor".

+

Va rugam introduceti informatiile de pe randul {{row_num}} completat din tabelul VII. "Venituri ale declarantului + si ale membrilor sai de familie - 3. Venituri din cedarea folosintei bunurilor".

{% endblock %} diff --git a/project_template/templates/tasks/owned_income_from_gambling.html b/project_template/templates/tasks/owned_income_from_gambling.html index d37fb60..f1c882c 100644 --- a/project_template/templates/tasks/owned_income_from_gambling.html +++ b/project_template/templates/tasks/owned_income_from_gambling.html @@ -2,7 +2,8 @@ {% block explanation %}
-

Va rugam introduceti informatiile de pe randul {{nr_rand}} completat din tabelul VII. "Venituri ale declarantului si ale membrilor sai de familie - 7. Venituri din premii si jocuri de noroc".

+

Va rugam introduceti informatiile de pe randul {{row_num}} completat din tabelul VII. "Venituri ale declarantului + si ale membrilor sai de familie - 7. Venituri din premii si jocuri de noroc".

{% endblock %} diff --git a/project_template/templates/tasks/owned_income_from_salaries.html b/project_template/templates/tasks/owned_income_from_salaries.html index cecb0e4..0a369e7 100644 --- a/project_template/templates/tasks/owned_income_from_salaries.html +++ b/project_template/templates/tasks/owned_income_from_salaries.html @@ -2,7 +2,8 @@ {% block explanation %}
-

Va rugam introduceti informatiile de pe randul {{nr_rand}} completat din tabelul VII. Venituri ale declarantului si ale membrilor sai de familie - sectiunea 1. Venituri din salarii

+

Va rugam introduceti informatiile de pe randul {{row_num}} completat din tabelul VII. Venituri ale declarantului + si ale membrilor sai de familie - sectiunea 1. Venituri din salarii

{% endblock %} From af11fa4e34c92303864306a3e164e9173bf43906 Mon Sep 17 00:00:00 2001 From: Constantin Lungu Date: Mon, 12 Aug 2019 01:34:21 +0300 Subject: [PATCH 2/2] #123 Implement display of row_number parameter for child tasks : changes after latest development. Retest & fixes --- project_template/tasks.py | 43 ++++++++++++++++--- ...ed_income_from_independent_activities.html | 3 +- 2 files changed, 39 insertions(+), 7 deletions(-) diff --git a/project_template/tasks.py b/project_template/tasks.py index 0465416..de2ee61 100644 --- a/project_template/tasks.py +++ b/project_template/tasks.py @@ -7,6 +7,7 @@ import project_template.forms as forms from project_template.task_templates import DigitalizationTask, CountTableRowsTask + class TaskGetInitialInformation(DigitalizationTask): task_form = forms.TranscribeInitialInformation template_name = 'tasks/general_information_task.html' @@ -62,6 +63,7 @@ class TaskOwnedLandTable(CountTableRowsTask): storage_model = models.OwnedLandTable child_class = TaskOwnedLandRowEntry + class TaskOwnedAutomobileRowEntry(DigitalizationTask): task_form = forms.TranscribeOwnedAutomobileRowEntry template_name = "tasks/owned_automobile.html" @@ -76,11 +78,13 @@ def save_verified_data(self, verified_data): row_number=self.row_number if hasattr(self, 'row_number') else -1 ) + class TaskOwnedAutomobileTable(CountTableRowsTask): task_form = forms.TranscribeOwnedAutomobileTable storage_model = models.OwnedAutomobileTable child_class = TaskOwnedAutomobileRowEntry + class TaskOwnedBankAccountsRowEntry(DigitalizationTask): task_form = forms.TranscribeOwnedBankAccountsRowEntry template_name = "tasks/owned_bank_accounts.html" @@ -95,11 +99,13 @@ def save_verified_data(self, verified_data): row_number=self.row_number if hasattr(self, 'row_number') else -1 ) + class TaskOwnedBankAccountsTable(CountTableRowsTask): task_form = forms.TranscribeOwnedBankAccountsTable storage_model = models.OwnedBankAccountsTable child_class = TaskOwnedBankAccountsRowEntry + class TaskOwnedIncomeFromAgriculturalActivitiesRowEntry(DigitalizationTask): task_form = forms.TranscribeOwnedIncomeFromAgriculturalActivitiesRowEntry template_name = "tasks/agricultural_activity.html" @@ -124,11 +130,13 @@ def save_verified_data(self, verified_data): currency=verified_data['currency'] ) + class TaskOwnedIncomeFromAgriculturalActivitiesTable(CountTableRowsTask): task_form = forms.TranscribeOwnedIncomeFromAgriculturalActivitiesTable storage_model = models.OwnedIncomeFromAgriculturalActivitiesTable child_class = TaskOwnedIncomeFromAgriculturalActivitiesRowEntry + class TaskOwnedDebtsRowEntry(DigitalizationTask): task_form = forms.TranscribeOwnedDebtsRowEntry template_name = "tasks/owned_debts.html" @@ -157,13 +165,15 @@ def save_verified_data(self, verified_data): value=verified_data['loan_amount'], currency=verified_data['currency'], row_number=self.row_number if hasattr(self, 'row_number') else -1 - ) + ) + class TaskOwnedDebtsTable(CountTableRowsTask): task_form = forms.TranscribeOwnedDebtsTable storage_model = models.OwnedDebtsTable child_class = TaskOwnedDebtsRowEntry + class TaskOwnedIncomeFromPensionsRowEntry(DigitalizationTask): task_form = forms.TranscribeOwnedIncomeFromPensionsRowEntry template_name = "tasks/owned_income_from_pensions.html" @@ -187,11 +197,13 @@ def save_verified_data(self, verified_data): currency=verified_data['currency'], row_number=self.row_number if hasattr(self, 'row_number') else -1) + class TaskOwnedIncomeFromPensionsTable(CountTableRowsTask): task_form = forms.TranscribeOwnedIncomeFromPensionsTable storage_model = models.OwnedIncomeFromPensionsTable child_class = TaskOwnedIncomeFromPensionsRowEntry + class TaskOwnedGoodsOrServicesRowEntry(DigitalizationTask): task_form = forms.TranscribeOwnedGoodsOrServicesRowEntry template_name = "tasks/owned_goods_or_services.html" @@ -222,14 +234,15 @@ class TaskOwnedGoodsOrServicesTable(CountTableRowsTask): storage_model = models.OwnedGoodsOrServicesTable child_class = TaskOwnedGoodsOrServicesRowEntry + class TaskOwnedInvestmentsOver5KRowEntry(DigitalizationTask): task_form = forms.TranscribeOwnedInvestmentsOver5KRowEntry template_name = "tasks/owned_investments_over_5k.html" def save_verified_data(self, verified_data): loan_beneficiary, created = models.Person.objects.get_or_create( - name=verified_data['name'], - surname=verified_data['surname'] + name=verified_data['beneficiary_name'], + surname=verified_data['beneficiary_surname'] ) owned_investments_over_5k, created = models.OwnedInvestmentsOver5KTableEntry.objects.get_or_create( @@ -240,7 +253,8 @@ def save_verified_data(self, verified_data): number_of_stocks=verified_data['number_of_stocks'], share_ratio=verified_data['share_ratio'], total_value=verified_data['total_value'], - currency=verified_data['currency'] + currency=verified_data['currency'], + row_number=self.row_number if hasattr(self, 'row_number') else -1 ) @@ -249,6 +263,7 @@ class TaskOwnedInvestmentsOver5KTable(CountTableRowsTask): storage_model = models.OwnedInvestmentsOver5KTable child_class = TaskOwnedInvestmentsOver5KRowEntry + class TaskOwnedIncomeFromOtherSourcesRowEntry(DigitalizationTask): task_form = forms.TranscribeOwnedIncomeFromOtherSourcesRowEntry template_name = "tasks/owned_income_other_sources.html" @@ -270,13 +285,16 @@ def save_verified_data(self, verified_data): service=verified_data['service'], annual_income=verified_data['annual_income'], currency=verified_data['currency'], - ) + row_number=self.row_number if hasattr(self, 'row_number') else -1 + ) + class TaskOwnedIncomeFromOtherSourcesTable(CountTableRowsTask): task_form = forms.TranscribeOwnedIncomeFromOtherSourcesTable storage_model = models.OwnedIncomeFromOtherSourcesTable child_class = TaskOwnedIncomeFromOtherSourcesRowEntry + class TaskOwnedJewelryRowEntry(DigitalizationTask): task_form = forms.TranscribeOwnedJewelryRowEntry template_name = "tasks/owned_jewelry.html" @@ -289,11 +307,13 @@ def save_verified_data(self, verified_data): currency=verified_data['currency'], row_number=self.row_number if hasattr(self, 'row_number') else -1) + class TaskOwnedJewelryTable(CountTableRowsTask): task_form = forms.TranscribeOwnedJewelryTable storage_model = models.OwnedJewelryTable child_class = TaskOwnedJewelryRowEntry + class TaskExtraValuableRowEntry(DigitalizationTask): task_form = forms.TranscribeExtraValuableRowEntry template_name = "tasks/owned_extra_valuable.html" @@ -317,11 +337,13 @@ def save_verified_data(self, verified_data): row_number=self.row_number if hasattr(self, 'row_number') else -1 ) + class TaskExtraValuableTable(CountTableRowsTask): task_form = forms.TranscribeExtraValuableTable storage_model = models.OwnedExtraValuableTable child_class = TaskExtraValuableRowEntry + class TaskOwnedIncomeFromDeferredUseOfGoodsRowEntry(DigitalizationTask): task_form = forms.TranscribeOwnedIncomeFromDeferredUseOfGoodsRowEntry template_name = "tasks/owned_income_from_deferred_use_of_goods.html" @@ -352,6 +374,7 @@ class TaskOwnedIncomeFromDeferredUseOfGoodsTable(CountTableRowsTask): storage_model = models.OwnedIncomeFromDeferredUseOfGoodsTable child_class = TaskOwnedIncomeFromDeferredUseOfGoodsRowEntry + class TaskOwnedIncomeFromIndependentActivitiesRowEntry(DigitalizationTask): task_form = forms.TranscribeIndependentActivitiesRowEntry template_name = "tasks/owned_income_from_independent_activities.html" @@ -373,13 +396,16 @@ def save_verified_data(self, verified_data): service=verified_data['service'], annual_income=verified_data['annual_income'], currency=verified_data['currency'], + row_number=self.row_number if hasattr(self, 'row_number') else -1 ) + class TaskOwnedIncomeFromIndependentActivitiesTable(CountTableRowsTask): task_form = forms.TranscribeIndependentActivitiesTable storage_model = models.OwnedIncomeFromIndependentActivitiesTable child_class = TaskOwnedIncomeFromIndependentActivitiesRowEntry + class TaskOwnedIncomeFromGamblingRowEntry(DigitalizationTask): task_form = forms.TranscribeOwnedIncomeFromGamblingRowEntry template_name = "tasks/owned_income_from_gambling.html" @@ -404,11 +430,13 @@ def save_verified_data(self, verified_data): row_number=self.row_number if hasattr(self, 'row_number') else -1 ) + class TaskOwnedIncomeFromGamblingTable(CountTableRowsTask): task_form = forms.TranscribeOwnedIncomeFromGamblingTable storage_model = models.OwnedIncomeFromGamblingTable child_class = TaskOwnedIncomeFromGamblingRowEntry + class TaskOwnedIncomeFromSalariesRowEntry(DigitalizationTask): task_form = forms.TranscribeOwnedIncomeFromSalariesRowEntry template_name = "tasks/owned_income_from_salaries.html" @@ -433,11 +461,13 @@ def save_verified_data(self, verified_data): row_number=self.row_number if hasattr(self, 'row_number') else -1 ) + class TaskOwnedIncomeFromSalariesTable(CountTableRowsTask): task_form = forms.TranscribeOwnedIncomeFromSalariesTable storage_model = models.OwnedIncomeFromSalariesTable child_class = TaskOwnedIncomeFromSalariesRowEntry + class TaskOwnedBuildingsRowEntry(DigitalizationTask): task_form = forms.TranscribeOwnedBuildingsRowEntry template_name = "tasks/owned_buildings_task.html" @@ -465,7 +495,6 @@ def save_verified_data(self, verified_data): ) -@register() class TaskOwnedBuildingsTable(CountTableRowsTask): task_form = forms.TranscribeOwnedBuildingsTable storage_model = models.OwnedBuildingsTable @@ -496,6 +525,8 @@ def save_verified_data(self, verified_data): row_number=self.row_number if hasattr(self, 'row_number') else -1 ) + +@register() class TaskOwnedIncomeFromInvestmentsTable(CountTableRowsTask): task_form = forms.TranscribeOwnedIncomeFromInvestmentsTable storage_model = models.OwnedIncomeFromInvestmentsTable diff --git a/project_template/templates/tasks/owned_income_from_independent_activities.html b/project_template/templates/tasks/owned_income_from_independent_activities.html index 06b6592..d10cd27 100644 --- a/project_template/templates/tasks/owned_income_from_independent_activities.html +++ b/project_template/templates/tasks/owned_income_from_independent_activities.html @@ -2,7 +2,8 @@ {% block explanation %}
-

Va rugam introduceti informatiile de pe randul {{nr_rand}} completat din tabelul VII "Venituri ale declarantului si ale membrilor sai de familie - 2. Venituri din activitati independente".

+

Va rugam introduceti informatiile de pe randul {{row_num}} completat din tabelul VII "Venituri ale declarantului + si ale membrilor sai de familie - 2. Venituri din activitati independente".

{% endblock %}