namirasoft-cost 1.4.37 → 1.4.38
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/dist/type/Period.d.ts +4 -0
- package/dist/type/Period.js +5 -2
- package/dist/type/Period.js.map +1 -1
- package/package.json +1 -1
- package/src/type/Period.ts +9 -2
package/dist/type/Period.d.ts
CHANGED
package/dist/type/Period.js
CHANGED
|
@@ -39,10 +39,13 @@ class PeriodUtil {
|
|
|
39
39
|
return (period.end.minute * 60 + period.end.second) - (period.start.minute * 60 + period.start.second) + 1;
|
|
40
40
|
}
|
|
41
41
|
static toDates(period) {
|
|
42
|
-
let start =
|
|
43
|
-
let end =
|
|
42
|
+
let start = PeriodUtil.toDate(period, period.start);
|
|
43
|
+
let end = PeriodUtil.toDate(period, period.end);
|
|
44
44
|
return { start, end };
|
|
45
45
|
}
|
|
46
|
+
static toDate(period, hm) {
|
|
47
|
+
return new Date(period.year, period.month - 1, period.day, period.hour, hm.minute, hm.second);
|
|
48
|
+
}
|
|
46
49
|
static byDates(start, end) {
|
|
47
50
|
return {
|
|
48
51
|
year: start.getFullYear(),
|
package/dist/type/Period.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Period.js","sourceRoot":"","sources":["../../src/type/Period.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qDAAgD;AAChD,yDAAoF;AAkBpF,MAAa,YAAa,SAAQ,gCAAY;IAE1C,YAAY,QAAiB;QAEzB,KAAK,CAAC,QAAQ,EAAE,QAAQ,EAAE;YACtB,IAAI,sCAAkB,CAAC,MAAM,EAAE,IAAI,iCAAa,CAAC,IAAI,EAAE,CAAC,EAAE,IAAI,CAAC,CAAC;YAChE,IAAI,sCAAkB,CAAC,OAAO,EAAE,IAAI,iCAAa,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;YAC/D,IAAI,sCAAkB,CAAC,KAAK,EAAE,IAAI,iCAAa,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;YAC7D,IAAI,sCAAkB,CAAC,MAAM,EAAE,IAAI,iCAAa,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;YAC9D,IAAI,sCAAkB,CAAC,OAAO,EAAE,IAAI,gCAAY,CAAC,EAAE,EAAE,IAAI,EAAE;gBACvD,IAAI,sCAAkB,CAAC,QAAQ,EAAE,IAAI,iCAAa,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;gBAChE,IAAI,sCAAkB,CAAC,QAAQ,EAAE,IAAI,iCAAa,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;aACnE,CAAC,CAAC;YACH,IAAI,sCAAkB,CAAC,KAAK,EAAE,IAAI,gCAAY,CAAC,EAAE,EAAE,IAAI,EAAE;gBACrD,IAAI,sCAAkB,CAAC,QAAQ,EAAE,IAAI,iCAAa,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;gBAChE,IAAI,sCAAkB,CAAC,QAAQ,EAAE,IAAI,iCAAa,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;aACnE,CAAC,CAAC;SACN,CAAC,CAAC;QACH,IAAI,CAAC,QAAQ,GAAG;YACZ,OAAO,EAAE,eAAe;SAC3B,CAAC;IACN,CAAC;CACJ;AAtBD,oCAsBC;AACD,MAAa,UAAU;IAEnB,MAAM,CAAC,SAAS,CAAC,MAAc;QAE3B,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,GAAG,EAAE,GAAG,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,GAAG,EAAE,GAAG,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;IAC9G,CAAC;IACD,MAAM,CAAC,OAAO,CAAC,MAAc;QAEzB,IAAI,KAAK,GAAG,
|
|
1
|
+
{"version":3,"file":"Period.js","sourceRoot":"","sources":["../../src/type/Period.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/src/type/Period.ts
CHANGED
|
@@ -48,10 +48,17 @@ export class PeriodUtil
|
|
|
48
48
|
}
|
|
49
49
|
static toDates(period: Period)
|
|
50
50
|
{
|
|
51
|
-
let start =
|
|
52
|
-
let end =
|
|
51
|
+
let start = PeriodUtil.toDate(period, period.start);
|
|
52
|
+
let end = PeriodUtil.toDate(period, period.end);
|
|
53
53
|
return { start, end };
|
|
54
54
|
}
|
|
55
|
+
static toDate(period: Period, hm: {
|
|
56
|
+
minute: number;
|
|
57
|
+
second: number;
|
|
58
|
+
})
|
|
59
|
+
{
|
|
60
|
+
return new Date(period.year, period.month - 1, period.day, period.hour, hm.minute, hm.second);
|
|
61
|
+
}
|
|
55
62
|
static byDates(start: Date, end: Date)
|
|
56
63
|
{
|
|
57
64
|
return {
|