diff --git a/nemosis/data_fetch_methods.py b/nemosis/data_fetch_methods.py index 81ae706..5a41df6 100644 --- a/nemosis/data_fetch_methods.py +++ b/nemosis/data_fetch_methods.py @@ -831,6 +831,7 @@ def _static_table_wrapper_for_gui( _method_map = { + "DUALLOC": _dynamic_data_wrapper_for_gui, "DISPATCHLOAD": _dynamic_data_wrapper_for_gui, "DISPATCHPRICE": _dynamic_data_wrapper_for_gui, "TRADINGLOAD": _dynamic_data_wrapper_for_gui, diff --git a/nemosis/defaults.py b/nemosis/defaults.py index a9a57ba..89a08d0 100644 --- a/nemosis/defaults.py +++ b/nemosis/defaults.py @@ -2,6 +2,7 @@ "FCAS Providers": "NEM Registration and Exemption List.xls", "DISPATCHLOAD": "PUBLIC_DVD_DISPATCHLOAD", "NEXT_DAY_DISPATCHLOAD": "PUBLIC_NEXT_DAY_DISPATCHLOAD", + "DUALLOC": "PUBLIC_DVD_DUALLOC", "DUDETAILSUMMARY": "PUBLIC_DVD_DUDETAILSUMMARY", "DUDETAIL": "PUBLIC_DVD_DUDETAIL", "DISPATCHCONSTRAINT": "PUBLIC_DVD_DISPATCHCONSTRAINT", @@ -40,6 +41,7 @@ "FCAS Providers": "STATICXL", "DISPATCHLOAD": "MMS", "NEXT_DAY_DISPATCHLOAD": "NEXT_DAY_DISPATCHLOAD", + "DUALLOC": "MMS", "DUDETAILSUMMARY": "MMS", "DUDETAIL": "MMS", "DISPATCHCONSTRAINT": "MMS", @@ -85,6 +87,7 @@ "FCAS Providers", "DISPATCHLOAD", "NEXT_DAY_DISPATCHLOAD", + "DUALLOC", "DUDETAILSUMMARY", "DUDETAIL", "DISPATCHCONSTRAINT", @@ -140,6 +143,7 @@ data_url = { "DISPATCHLOAD": "aemo_data_url", + "DUALLOC": "aemo_data_url", "DUDETAILSUMMARY": "aemo_data_url", "DUDETAIL": "aemo_data_url", "DISPATCHCONSTRAINT": "aemo_data_url", @@ -213,6 +217,13 @@ ] table_columns = { + "DUALLOC": [ + "EFFECTIVEDATE", + "VERSIONNO", + "DUID", + "GENSETID", + "LASTCHANGED", + ], "DISPATCHLOAD": [ "SETTLEMENTDATE", "DUID", @@ -661,6 +672,12 @@ } table_primary_keys = { + "DUALLOC": [ + "DUID", + "EFFECTIVEDATE", + "GENSETID", + "VERSIONNO", + ], "DISPATCHCONSTRAINT": [ "CONSTRAINTID", "GENCONID_EFFECTIVEDATE", @@ -756,6 +773,7 @@ } effective_date_group_col = { + "DUALLOC": ['DUID'], "SPDREGIONCONSTRAINT": ["GENCONID"], "SPDCONNECTIONPOINTCONSTRAINT": ["GENCONID"], "SPDINTERCONNECTORCONSTRAINT": ["GENCONID"], @@ -773,6 +791,7 @@ } primary_date_columns = { + "DUALLOC": "EFFECTIVEDATE", "DISPATCHLOAD": "SETTLEMENTDATE", "NEXT_DAY_DISPATCHLOAD": "SETTLEMENTDATE", "TRADINGLOAD": "SETTLEMENTDATE", diff --git a/nemosis/processing_info_maps.py b/nemosis/processing_info_maps.py index f24e63f..3abfe6d 100644 --- a/nemosis/processing_info_maps.py +++ b/nemosis/processing_info_maps.py @@ -10,6 +10,7 @@ setup = { + "DUALLOC": None, "DISPATCHLOAD": None, "NEXT_DAY_DISPATCHLOAD": None, "TRADINGLOAD": None, @@ -46,6 +47,7 @@ } search_type = { + "DUALLOC": "end", "DISPATCHLOAD": "start_to_end", "NEXT_DAY_DISPATCHLOAD": "start_to_end", "TRADINGLOAD": "start_to_end", @@ -82,6 +84,7 @@ } date_cols = { + "DUALLOC": ["EFFECTIVEDATE"], "DISPATCHLOAD": ["SETTLEMENTDATE"], "NEXT_DAY_DISPATCHLOAD": ["SETTLEMENTDATE"], "TRADINGLOAD": ["SETTLEMENTDATE"], @@ -118,6 +121,7 @@ } filter = { + "DUALLOC": filters.filter_on_effective_date, "DISPATCHLOAD": filters.filter_on_settlementdate, "NEXT_DAY_DISPATCHLOAD": filters.filter_on_settlementdate, "TRADINGLOAD": filters.filter_on_settlementdate, @@ -154,6 +158,7 @@ } finalise = { + "DUALLOC": None, "DISPATCHLOAD": None, "NEXT_DAY_DISPATCHLOAD": None, "TRADINGLOAD": None,