diff --git a/CHANGELOG.md b/CHANGELOG.md index 4bd9c3e0..e2ad82be 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,12 +14,18 @@ - PR: #40 - 36 template fixes - PR: #41 +- 30 support for new tables + - PR: #33 +- Update dev + - PR: #45 +- Merge pull request #45 from closup/main + - PR: #46 +- update for template + - PR: #47 - 30 support for new tables - PR: #49 - 7 sessions - PR: #51 -- 28 image handling - - PR: #38 - #54 implemented custom line items - PR: #55 - 52 add back button @@ -88,6 +94,8 @@ - PR: #123 - Move all partial fixes to dev branch - PR: #124 +- Revert changes to make main functional + - PR: #130 - Update .gitignore - PR: #135 - flask key .env deleted (only local on Luca pc rn) @@ -132,4 +140,18 @@ - PR: #167 - 158 dev review - PR: #168 +- Dev + - PR: #158 +- Create TEMPLATE-README + - PR: #169 +- Update README.md + - PR: #170 +- Add 'more information' button + - PR: #171 +- Update with patches and documentation + - PR: #174 +- 165 domain issues + - PR: #173 +- Member should be an element, not text + - PR: #176 diff --git a/app/models/dimension.py b/app/models/dimension.py index 96935b22..232bd03a 100644 --- a/app/models/dimension.py +++ b/app/models/dimension.py @@ -7,29 +7,24 @@ def __init__(self, col_name : str, type = None): self._member_name = get_col_no_spaces(col_name) # Default value self._member_type = "typed" # Default type self._axis = "Default" - self._domain = "Default" if col_name in axis_dict: self._member_type = "explicit" - self._axis, self._domain, self._member_name = axis_dict[col_name] + self._axis, self._member_name = axis_dict[col_name] elif type == "gov": # custom gov funds - self._axis, self._domain = "FundIdentifier", "FundIdentifier" + self._axis = "FundIdentifier" elif type == "prop": # custom proprietary funds - self._axis, self._domain = "TypeOfActivitiesProprietaryFunds", "ProprietaryFunds" + self._axis = "TypeOfActivitiesProprietaryFunds" elif type == "custom": # Custom line item - self._axis, self._domain = "DisaggregationLineItem", "" + self._axis = "DisaggregationLineItem" @property def axis(self): return f"acfr:{self._axis}Axis" - @property - def domain(self): - return f"acfr:{self._domain}Domain" - @property def member_name(self): return f"acfr:{self._member_name}Member" diff --git a/app/templates/site/base_page.html b/app/templates/site/base_page.html index c0638b3a..94847b18 100644 --- a/app/templates/site/base_page.html +++ b/app/templates/site/base_page.html @@ -54,6 +54,11 @@

Inline XBRL Conversion Tool

This product is in-development. As such, errors are to be expected along with frequent changes in functionality.
This product should not be used for actual production of financial reports. +
+ + More Information + +
diff --git a/app/templates/xbrl/contexts.html b/app/templates/xbrl/contexts.html index 07e77fed..0168bd92 100644 --- a/app/templates/xbrl/contexts.html +++ b/app/templates/xbrl/contexts.html @@ -5,9 +5,7 @@ {% for dim in context.dims() %} - {% if dim.domain %}<{{ dim.domain }}>{% endif %} - {{ dim.member_name }} - {% if dim.domain %}{% endif %} + <{{ dim.member_name }}> {% endfor %} @@ -24,4 +22,4 @@ {% endfor %} -{% include 'xbrl/word_contexts.html' %} \ No newline at end of file +{% include 'xbrl/word_contexts.html' %} diff --git a/app/utils/constants.py b/app/utils/constants.py index df2ab935..6c431223 100644 --- a/app/utils/constants.py +++ b/app/utils/constants.py @@ -41,20 +41,20 @@ "capital_grants_and_contributions"], "GovernmentalFunds" : ["total", "general_fund"] } -# Dimension axis, domain, and member name by column name in Excel template -axis_dict = {"governmental_activities" : ("TypeOfGovernmentUnit", None, "GovernmentalActivities"), - "business-type_activities" : ("TypeOfGovernmentUnit", None, "BusinessTypeActivities"), - "total_primary_government" : ("TypeOfGovernmentUnit", None, "PrimaryGovernmentActivities"), - "component_units" : ("TypeOfGovernmentUnit", None, "ComponentUnitDiscretelyPresented"), - "charges_for_services" : ("TypeOfProgramRevenues", None, "ProgramRevenuesFromChargesForServices"), - "operating_grants_and_contributions" : ("TypeOfProgramRevenues", None, "ProgramRevenuesFromOperatingGrantsAndContributions"), - "capital_grants_and_contributions" : ("TypeOfProgramRevenues", None, "ProgramRevenuesFromCapitalGrantsAndContributions"), +# Dimension axis and member name by column name in Excel template +axis_dict = {"governmental_activities" : ("TypeOfGovernmentUnit", "GovernmentalActivities"), + "business-type_activities" : ("TypeOfGovernmentUnit", "BusinessTypeActivities"), + "total_primary_government" : ("TypeOfGovernmentUnit", "PrimaryGovernmentActivities"), + "component_units" : ("TypeOfGovernmentUnit", "ComponentUnitDiscretelyPresented"), + "charges_for_services" : ("TypeOfProgramRevenues", "ProgramRevenuesFromChargesForServices"), + "operating_grants_and_contributions" : ("TypeOfProgramRevenues", "ProgramRevenuesFromOperatingGrantsAndContributions"), + "capital_grants_and_contributions" : ("TypeOfProgramRevenues", "ProgramRevenuesFromCapitalGrantsAndContributions"), # gov funds - "general_fund" : ("GovernmentalFunds", None, "GeneralFund"), - "total_governmental_funds" : ("GovernmentalFunds", None, "GovernmentalFunds"), + "general_fund" : ("GovernmentalFunds", "GeneralFund"), + "total_governmental_funds" : ("GovernmentalFunds", "GovernmentalFunds"), # Prop funds - "total_enterprise_funds" : ("TypeOfActivitiesProprietaryFunds", "ProprietaryFunds", "BusinessTypeActivitiesEnterpriseFunds"), - "internal_service_funds" : ("TypeOfActivitiesProprietaryFunds", "ProprietaryFunds", "InternalServiceFunds")} + "total_enterprise_funds" : ("TypeOfActivitiesProprietaryFunds", "BusinessTypeActivitiesEnterpriseFunds"), + "internal_service_funds" : ("TypeOfActivitiesProprietaryFunds", "InternalServiceFunds")} # ============================================================= # Mammoth style conversions from Word