Merge pull request #2 from briis/2-beta3

Version 2 beta3

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,27 +1,87 @@
----
-name: Bug report
-about: Create a report to help us improve
-title: ''
-labels: ''
-assignees: ''
+name: Report a bug / issue
+description: Report an issue with the Affaldshåndtering DK integration
+labels: ["bug"]
+assignees:
+  - briis
+body:
+  - type: markdown
+    attributes:
+      value: |
+        This issue form is for reporting bugs only!
+  - type: textarea
+    validations:
+      required: true
+    attributes:
+      label: Describe the issue
+      description: >-
+        Describe the issue you are experiencing here.
+        Describe what you were trying to do and what happened.
 
----
+        Provide a clear and concise description of what the problem is.
+  - type: markdown
+    attributes:
+      value: |
+        ## Environment
+  - type: input
+    id: version
+    validations:
+      required: true
+    attributes:
+      label: What version of Home Assistant Core has the issue?
+      placeholder: core-
+      description: >
+        Can be found in: [Settings ⇒ System ⇒ Repairs ⇒ Three Dots in Upper Right ⇒ System information](https://my.home-assistant.io/redirect/system_health/).
 
-**Describe the bug**
-A clear and concise description of what the bug is.
+        [![Open your Home Assistant instance and show the system information.](https://my.home-assistant.io/badges/system_health.svg)](https://my.home-assistant.io/redirect/system_health/)
+  - type: input
+    attributes:
+      label: What was the last working version of Home Assistant Core?
+      placeholder: core-
+      description: >
+        If known, otherwise leave blank.
+  - type: dropdown
+    validations:
+      required: true
+    attributes:
+      label: What type of installation are you running?
+      description: >
+        Can be found in: [Settings ⇒ System ⇒ Repairs ⇒ Three Dots in Upper Right ⇒ System information](https://my.home-assistant.io/redirect/system_health/).
 
-**To Reproduce**
-Steps to reproduce the behavior:
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
+        [![Open your Home Assistant instance and show the system information.](https://my.home-assistant.io/badges/system_health.svg)](https://my.home-assistant.io/redirect/system_health/)
+      options:
+        - Home Assistant OS
+        - Home Assistant Container
+        - Home Assistant Supervised
+        - Home Assistant Core
+  - type: markdown
+    attributes:
+      value: |
+        # Details
+  - type: textarea
+    validations:
+      required: true
+    attributes:
+      label: Diagnostics information
+      placeholder: "drag-and-drop the diagnostics data file here (do not copy-and-paste the content)"
+      description: >-
+        This integrations provide the ability to [download diagnostic data](https://www.home-assistant.io/docs/configuration/troubleshooting/#debug-logs-and-diagnostics).
 
-**Expected behavior**
-A clear and concise description of what you expected to happen.
+        **It would really help if you could download the diagnostics data for the device you are having issues with,
+        and <ins>drag-and-drop that file into the textbox below.</ins>**
 
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
+        It generally allows pinpointing defects and thus resolving issues faster.
 
-**Additional context**
-Add any other context about the problem here.
+        If you are unable to provide the diagnostics (ie. you cannot add the integration), please write **None** in this field.
+  - type: textarea
+    attributes:
+      label: Anything in the logs that might be useful for us?
+      description: For example, error message, or stack traces.
+      render: txt
+  - type: textarea
+    attributes:
+      label: Additional information
+      description: >
+        If you have any additional information for us, use the field below.
+  - type: markdown
+    attributes:
+      value: "Template created by @MTrab. Thank you."

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,20 +1,32 @@
----
 name: Feature request
-about: Suggest an idea for this project
-title: ''
-labels: ''
-assignees: ''
+description: Make a request for a new feature in the Affaldshåndtering DK integration
+title: "[FR]: "
+labels: ["feature request"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        This form is only for requesting new features to the integration.
 
----
-
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
-
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
-
-**Additional context**
-Add any other context or screenshots about the feature request here.
+        Remember to add a descriptive title after the predefined text.
+  - type: textarea
+    validations:
+      required: true
+    attributes:
+      label: Describe the feature you wish to make a request for
+      description: >-
+        Provide a clear and concise description of what you wish for.
+        The more precise and detailed the more likely it is to be accepted and made.
+  - type: textarea
+    attributes:
+      label: Describe alternatives you've considered
+      description: >-
+        Have you considered any alternatives (ie. other existing integrations that can handle this)
+  - type: textarea
+    attributes:
+      label: Additional context
+      description: >-
+        Add any other context or screenshots about the feature request here.
+  - type: markdown
+    attributes:
+      value: "Template created by @MTrab. Thank you."

.vscode/launch.json

@@ -5,15 +5,13 @@
     "version": "0.2.0",
     "configurations": [
         {
-            "name": "Python: Debug Renoweb",
-            "type": "python",
+            "name": "Python: Debug Affaldshåndtering DK",
+            "type": "debugpy",
             "request": "attach",
             "justMyCode": false,
-            "port": 5678,
-            "host": "localhost",
             "pathMappings": [
                 {
-                    "localRoot": "/workspaces/renoweb",
+                    "localRoot": "/workspaces/affalddk",
                     "remoteRoot": "."
                 }
             ]

custom_components/affalddk/config_flow.py

@@ -103,7 +103,7 @@ def __init__(self, config_entry: config_entries.ConfigEntry) -> None:
     async def async_step_init(self, user_input: dict[str, Any] | None = None) -> FlowResult:
         """Manage the options."""
         if user_input is not None:
-            return self.async_create_entry(title="Options for Renoweb", data=user_input)
+            return self.async_create_entry(title="Options for Affaldshåndtering DK", data=user_input)
 
         return self.async_show_form(
             step_id="init",

custom_components/affalddk/manifest.json

@@ -1,6 +1,9 @@
 {
     "domain": "affalddk",
     "name": "Affaldshåndtering DK",
+    "after_dependencies": [
+        "http"
+    ],
     "codeowners": [
         "@briis"
     ],
@@ -11,5 +14,5 @@
     "requirements": [
         "pyrenoweb==2.0.4"
     ],
-    "version": "2.0.0-beta2"
+    "version": "2.0.0-beta3"
 }

custom_components/affalddk/translations/da.json

@@ -5,7 +5,7 @@
             "request_error": "Fejl ved hentning af data fra serveren.",
             "location_not_found": "Den angivne adresse blev ikke fundet.",
             "municipality_not_supported": "Kommunen er ikke understøttet i denne Integration",
-            "connection_error": "Renoweb svarer ikke. Prøv igen senere."
+            "connection_error": "API svarer ikke. Prøv igen senere."
         },
         "step": {
             "user": {
@@ -15,7 +15,7 @@
                     "house_number": "Hus nummer",
                     "update_interval": "Opdaterings interval (timer)"
                 },
-                "description": "Hent opsamlingsdata fra danske kommuner.",
+                "description": "Hent affalds opsamlingsdata fra danske kommuner.",
                 "title": "Affald DK"
             }
         }

custom_components/affalddk/translations/en.json

@@ -5,7 +5,7 @@
             "location_not_found": "The location you entered is not found",
             "request_error": "Error retrieving data from the Endpoint",
             "municipality_not_supported": "The Municipality is not supported by this Integration",
-            "connection_error": "Renoweb is not sending data. Please try again later."
+            "connection_error": "The API is not sending data. Please try again later."
         },
         "step": {
             "user": {
@@ -15,7 +15,7 @@
                     "house_number": "House Number",
                     "update_interval": "Update Interval (Hours)"
                 },
-                "description": "Setup Home Assistant to collect Pick-Up data from Danish Municipalities.",
+                "description": "Setup Home Assistant to collect Garbage Pick-Up data from Danish Municipalities.",
                 "title": "Affald DK"
             }
         }

hacs.json

@@ -2,5 +2,8 @@
     "name": "Affaldshåndtering DK",
     "content_in_root": false,
     "render_readme": true,
-    "homeassistant": "2023.6.0"
+    "homeassistant": "2023.6.0",
+    "country": [
+        "DK"
+    ]
 }