investira.sdk 2.2.11 → 2.2.14
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +12 -0
- package/lib/tests/test_dates.js +7 -4
- package/lib/tests/test_formats.js +15 -15
- package/lib/utils/dates.js +11 -6
- package/package.json +5 -5
package/CHANGELOG.md
CHANGED
|
@@ -433,3 +433,15 @@ O contrutor para a criação das mensagem foi alterado.
|
|
|
433
433
|
# 2.2.11
|
|
434
434
|
|
|
435
435
|
- [investira.data] Atualização
|
|
436
|
+
|
|
437
|
+
# 2.2.12
|
|
438
|
+
|
|
439
|
+
- [investira.data] Atualização
|
|
440
|
+
|
|
441
|
+
# 2.2.13
|
|
442
|
+
|
|
443
|
+
- [investira.data] Controle de vigência do feriado
|
|
444
|
+
|
|
445
|
+
# 2.2.14
|
|
446
|
+
|
|
447
|
+
- [investira.data] Controle de vigência do feriado
|
package/lib/tests/test_dates.js
CHANGED
|
@@ -89,7 +89,7 @@ test('\ndates addWorkingDays', t => {
|
|
|
89
89
|
|
|
90
90
|
test('\ndates weekNames', t => {
|
|
91
91
|
dates.locale('pt-BR');
|
|
92
|
-
t.equal(dates.weekNames()[0], '
|
|
92
|
+
t.equal(dates.weekNames()[0], 'domingo');
|
|
93
93
|
dates.locale('en-US');
|
|
94
94
|
t.equal(dates.weekNames()[0], 'Sunday');
|
|
95
95
|
t.end();
|
|
@@ -126,18 +126,21 @@ test('\ndates workingDaysBetween', t => {
|
|
|
126
126
|
xData1 = dates.toDate('2019-04-30');
|
|
127
127
|
xData2 = dates.toDate('2019-05-01');
|
|
128
128
|
t.equal(dates.workingDaysBetween(xData1, xData2), 0);
|
|
129
|
+
// xData1 = dates.toDate('1988-04-20');
|
|
130
|
+
// xData2 = dates.toDate('1988-04-21');
|
|
131
|
+
// t.equal(dates.workingDaysBetween(xData1, xData2), 0);
|
|
129
132
|
xData1 = dates.toDate('2019-04-30');
|
|
130
133
|
xData2 = dates.toDate('2019-05-02');
|
|
131
134
|
t.equal(dates.workingDaysBetween(xData1, xData2), 1);
|
|
132
135
|
xData1 = dates.toDate('1995-12-31');
|
|
133
136
|
xData2 = dates.toDate('2018-12-31');
|
|
134
|
-
t.equal(dates.workingDaysBetween(xData1, xData2),
|
|
137
|
+
t.equal(dates.workingDaysBetween(xData1, xData2), 5775);
|
|
135
138
|
xData1 = dates.toDate('1995-01-01');
|
|
136
139
|
xData2 = dates.toDate('2018-12-31');
|
|
137
|
-
t.equal(dates.workingDaysBetween(xData1, xData2),
|
|
140
|
+
t.equal(dates.workingDaysBetween(xData1, xData2), 6023);
|
|
138
141
|
xData1 = dates.toDate('1995-01-03');
|
|
139
142
|
xData2 = dates.toDate('2070-01-03');
|
|
140
|
-
t.equal(dates.workingDaysBetween(xData1, xData2),
|
|
143
|
+
t.equal(dates.workingDaysBetween(xData1, xData2), 18836);
|
|
141
144
|
xData1 = dates.toDate('2019-08-05');
|
|
142
145
|
xData2 = dates.toDate('2019-08-04');
|
|
143
146
|
t.equal(dates.workingDaysBetween(xData1, xData2), 0);
|
|
@@ -14,26 +14,26 @@ test('\nformats.formatPhone', t => {
|
|
|
14
14
|
});
|
|
15
15
|
|
|
16
16
|
test('\nformats.friendlyNumber', t => {
|
|
17
|
-
t.equal(formats.friendlyNumber(123, 0, true), 'R$123');
|
|
17
|
+
t.equal(formats.friendlyNumber(123, 0, true), 'R$ 123');
|
|
18
18
|
t.equal(formats.friendlyNumber(123, 0, false), '123');
|
|
19
|
-
t.equal(formats.friendlyNumber(123, 0, true), 'R$123');
|
|
19
|
+
t.equal(formats.friendlyNumber(123, 0, true), 'R$ 123');
|
|
20
20
|
t.equal(formats.friendlyNumber(123, 0, false), '123');
|
|
21
21
|
t.equal(formats.friendlyNumber(1234567, 0, false), '1 mi');
|
|
22
|
-
t.equal(formats.friendlyNumber(1234567, 1, false), '1
|
|
23
|
-
t.equal(formats.friendlyNumber(1234567, 2, false), '1
|
|
24
|
-
t.equal(formats.friendlyNumber(1234567, 3, false), '1
|
|
22
|
+
t.equal(formats.friendlyNumber(1234567, 1, false), '1,2 mi');
|
|
23
|
+
t.equal(formats.friendlyNumber(1234567, 2, false), '1,23 mi');
|
|
24
|
+
t.equal(formats.friendlyNumber(1234567, 3, false), '1,235 mi');
|
|
25
25
|
t.equal(formats.friendlyNumber(1234000, 0, false), '1 mi');
|
|
26
|
-
t.equal(formats.friendlyNumber(1234000, 1, false), '1
|
|
27
|
-
t.equal(formats.friendlyNumber(1234000, 2, false), '1
|
|
28
|
-
t.equal(formats.friendlyNumber(1234000, 3, false), '1
|
|
29
|
-
t.equal(formats.friendlyNumber(1234000, 0, true), 'R$1 mi');
|
|
30
|
-
t.equal(formats.friendlyNumber(1234000, 1, true), 'R$1
|
|
31
|
-
t.equal(formats.friendlyNumber(1234000, 2, true), 'R$1
|
|
32
|
-
t.equal(formats.friendlyNumber(1234000, 3, true), 'R$1
|
|
33
|
-
t.equal(formats.friendlyNumber(-1234000, 3, false), '-1
|
|
26
|
+
t.equal(formats.friendlyNumber(1234000, 1, false), '1,2 mi');
|
|
27
|
+
t.equal(formats.friendlyNumber(1234000, 2, false), '1,23 mi');
|
|
28
|
+
t.equal(formats.friendlyNumber(1234000, 3, false), '1,234 mi');
|
|
29
|
+
t.equal(formats.friendlyNumber(1234000, 0, true), 'R$ 1 mi');
|
|
30
|
+
t.equal(formats.friendlyNumber(1234000, 1, true), 'R$ 1,2 mi');
|
|
31
|
+
t.equal(formats.friendlyNumber(1234000, 2, true), 'R$ 1,23 mi');
|
|
32
|
+
t.equal(formats.friendlyNumber(1234000, 3, true), 'R$ 1,234 mi');
|
|
33
|
+
t.equal(formats.friendlyNumber(-1234000, 3, false), '-1,234 mi');
|
|
34
34
|
t.equal(formats.friendlyNumber(0, 3, false), '0');
|
|
35
|
-
t.equal(formats.friendlyNumber(0.9123123424, 2, false), '0
|
|
36
|
-
t.equal(formats.friendlyNumber(0.9123123424, 2, true), 'R$0
|
|
35
|
+
t.equal(formats.friendlyNumber(0.9123123424, 2, false), '0,91');
|
|
36
|
+
t.equal(formats.friendlyNumber(0.9123123424, 2, true), 'R$ 0,91');
|
|
37
37
|
t.end();
|
|
38
38
|
});
|
|
39
39
|
|
package/lib/utils/dates.js
CHANGED
|
@@ -50,11 +50,16 @@ const dates = {
|
|
|
50
50
|
//Le todos os feriados cadastrados
|
|
51
51
|
for (let xHolidayString of dataHolidays[xKey].holidays) {
|
|
52
52
|
//Se for feriado fixo - que se repete todos os anos - configura o ano
|
|
53
|
-
if (xHolidayString.
|
|
54
|
-
const xMMDD = xHolidayString.substring(4, 12);
|
|
55
|
-
for (let x = 1970; x <=
|
|
56
|
-
|
|
57
|
-
|
|
53
|
+
if (xHolidayString.hasOwnProperty('date')) {
|
|
54
|
+
const xMMDD = xHolidayString.date.substring(4, 12);
|
|
55
|
+
for (let x = 1970; x <= 2090; x++) {
|
|
56
|
+
//Verifica se esta dentro do período de validade
|
|
57
|
+
if (
|
|
58
|
+
(!xHolidayString.since || x >= xHolidayString.since) &&
|
|
59
|
+
(!xHolidayString.until || x <= xHolidayString.until)
|
|
60
|
+
) {
|
|
61
|
+
pvLoadDataPush(xHolidays, xKey, x + xMMDD);
|
|
62
|
+
}
|
|
58
63
|
}
|
|
59
64
|
} else {
|
|
60
65
|
pvLoadDataPush(xHolidays, xKey, xHolidayString);
|
|
@@ -131,7 +136,7 @@ const dates = {
|
|
|
131
136
|
* Isso posto:
|
|
132
137
|
* Se feriado cair em um dia normalmente não útil(fim de semana), retornará false.
|
|
133
138
|
* Para saber se é um dia útil considerando fim de semana, utilize isWorkingDay.
|
|
134
|
-
* @param {Date}
|
|
139
|
+
* @param {Date} pDate
|
|
135
140
|
* @returns {boolean}
|
|
136
141
|
*/
|
|
137
142
|
isHoliday: pDate => {
|
package/package.json
CHANGED
|
@@ -1,16 +1,16 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "investira.sdk",
|
|
3
|
-
"version": "2.2.
|
|
3
|
+
"version": "2.2.14",
|
|
4
4
|
"author": "Investira",
|
|
5
5
|
"description": "Investira SDK",
|
|
6
6
|
"main": "index.js",
|
|
7
7
|
"type": "commonjs",
|
|
8
8
|
"registry": true,
|
|
9
|
-
"raw": "investira.sdk@2.2.
|
|
9
|
+
"raw": "investira.sdk@2.2.14",
|
|
10
10
|
"escapedName": "investira.sdk",
|
|
11
|
-
"rawSpec": "2.2.
|
|
11
|
+
"rawSpec": "2.2.14",
|
|
12
12
|
"saveSpec": null,
|
|
13
|
-
"fetchSpec": "2.2.
|
|
13
|
+
"fetchSpec": "2.2.14",
|
|
14
14
|
"homepage": "https://investira.com.br/",
|
|
15
15
|
"engines": {
|
|
16
16
|
"node": ">=11.11.0 <=14.17.5",
|
|
@@ -37,7 +37,7 @@
|
|
|
37
37
|
"axios": "0.25.0",
|
|
38
38
|
"deep-diff": "1.0.2",
|
|
39
39
|
"flatted": "3.2.2",
|
|
40
|
-
"investira.data": "^1.
|
|
40
|
+
"investira.data": "^1.2.2",
|
|
41
41
|
"moment": "^2.29.4"
|
|
42
42
|
},
|
|
43
43
|
"devDependencies": {
|