Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

V2.3.0 #128

Merged
merged 7 commits into from
Sep 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/test-and-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:

strategy:
matrix:
node-version: [18.x]
node-version: [20.x]

steps:
- uses: actions/checkout@v3
Expand Down Expand Up @@ -56,7 +56,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
node-version: [18.x, 20.x,22.x]
node-version: [20.x,22.x]
os: [ubuntu-latest, windows-latest, macos-latest]

steps:
Expand Down Expand Up @@ -92,7 +92,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [18.x]
node-version: [20.x]

steps:
- name: Checkout code
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2019-2023 jack-blackson [email protected]
Copyright (c) 2019-2024 jack-blackson [email protected]

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
7 changes: 6 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,11 @@ The goal of the adapter is to provide you a possibility to run countdowns for fu

## Changelog

### 2.3.0 (2024-09-20)
* (jack-blackson) Compatibility for js-controller 7
* (jack-blackson/bagsik) Added new object fullJSON with all objects included - thanks to bagsik who had the idea and created the code!


### 2.2.1 (2024-09-14)
* (jack-blackson) Additional check to avoid not allowed signs in countdown name
* (jack-blackson) Updated dependencies
Expand Down Expand Up @@ -145,7 +150,7 @@ The goal of the adapter is to provide you a possibility to run countdowns for fu
## License
The MIT License (MIT)

Copyright (c) 2019-2023 jack-blackson <[email protected]>
Copyright (c) 2019-2024 jack-blackson <[email protected]>

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
5 changes: 4 additions & 1 deletion docs/de/countdown.md
Original file line number Diff line number Diff line change
Expand Up @@ -64,4 +64,7 @@ sendTo("countdown.0", "send", {
|totalYears|Gesamtanzahl Anzahl Jahre bis zum Enddatum|

|reached|Boolean Feld, das definiert, ob das Enddatum erreicht wurde oder nicht|
|repeatEvery|Countdown wird nach Erreichen des Enddatums um diesen Zeitraum wiederholt|
|repeatEvery|Countdown wird nach Erreichen des Enddatums um diesen Zeitraum wiederholt|

|totalsJson|JSON mit Objekten für die Summe der Stunden, Tage, Wochen, Monate und Jahre|
|fullJson|JSON mit allen Objekten|
3 changes: 3 additions & 0 deletions docs/en/countdown.md
Original file line number Diff line number Diff line change
Expand Up @@ -65,3 +65,6 @@ sendTo("countdown.0", "send", {

|reached|Boolean field defining if the end date was reached or not|
|repeatEvery|Countdown is repeted by this period after reaching the enddate|

|totalsJson|JSON with the total objects for hours, days, weeks, months and years|
|fullJson|JSON with all objects|
15 changes: 14 additions & 1 deletion io-package.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,21 @@
{
"common": {
"name": "countdown",
"version": "2.2.1",
"version": "2.3.0",
"news": {
"2.3.0": {
"en": "Compatibility for js-controller 7\n",
"de": "Kompatibilität für js-controller 7\n",
"ru": "Совместимость js-контроллера 7\n",
"pt": "Compatibilidade para js-controller 7\n",
"nl": "Compatibiliteit voor js-controller 7\n",
"fr": "Compatibilité pour js-controller 7\n",
"it": "Compatibilità per js-controller 7\n",
"es": "Compatibilidad para js-controller 7\n",
"pl": "Zgodność dla kontrolera js- 7\n",
"uk": "Сумісність для js-controller 7 хв\n",
"zh-cn": "Js 控制器的兼容性 页:1\n"
},
"2.2.1": {
"en": "Additional check to avoid not allowed signs in countdown name",
"de": "Zusätzliche Überprüfung nicht erlaubt Zeichen im Countdown-Namen zu vermeiden",
Expand Down
99 changes: 99 additions & 0 deletions lib/stateAttr.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,99 @@
const stateAttrb = {
'name' : {
name: 'Name',
type: 'string',
role: 'value',
},
'reached' : {
name: 'Reached',
type: 'boolean',
role: 'value',
},
'countUp' : {
name: 'CountUp',
type: 'boolean',
role: 'value',
},
'years' : {
name: 'Years',
type: 'number',
role: 'value',
},
'months' : {
name: 'Months',
type: 'number',
role: 'value',
},
'days' : {
name: 'Days',
type: 'number',
role: 'value',
},
'hours' : {
name: 'Hours',
type: 'number',
role: 'value',
},
'minutes' : {
name: 'Minutes',
type: 'number',
role: 'value',
},
'totalDays' : {
name: 'Total no. of days',
type: 'number',
role: 'value',
},
'totalHours' : {
name: 'Total no. of hours',
type: 'number',
role: 'value',
},
'totalWeeks' : {
name: 'Total no. of weeks',
type: 'number',
role: 'value',
},
'totalMonths' : {
name: 'Total no. of months',
type: 'number',
role: 'value',
},
'totalYears' : {
name: 'Total no. of years',
type: 'number',
role: 'value',
},
'inWordsLong' : {
name: 'Result in words long',
type: 'string',
role: 'value',
},
'inWordsShort' : {
name: 'Result in words short',
type: 'string',
role: 'value',
},
'totalJson' : {
name: 'Totals as JSON',
type: 'string',
role: 'value',
},
'fullJson' : {
name: 'All values as JSON',
type: 'string',
role: 'value',
},
'endDate' : {
name: 'Enddate',
type: 'string',
role: 'value',
},
'repeatEvery' : {
name: 'Period when the Countdown should be repeated',
type: 'string',
role: 'value',
}
};

module.exports = stateAttrb;
Loading
Loading