namirasoft-cost 1.4.14 → 1.4.16
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/TimeUtil.js +8 -7
- package/dist/TimeUtil.js.map +1 -1
- package/dist/type/EstimationRow.d.ts +2 -1
- package/package.json +1 -1
- package/src/TimeUtil.ts +8 -7
- package/src/type/EstimationRow.ts +7 -7
package/dist/TimeUtil.js
CHANGED
|
@@ -28,12 +28,13 @@ class TimeUtil {
|
|
|
28
28
|
let start = period.start;
|
|
29
29
|
let end = null;
|
|
30
30
|
do {
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
if (period.end <
|
|
36
|
-
|
|
31
|
+
let next_start = namirasoft_core_1.TimeOperation.hoursLater(1, start);
|
|
32
|
+
next_start.setMilliseconds(0);
|
|
33
|
+
next_start.setSeconds(0);
|
|
34
|
+
next_start.setMinutes(0);
|
|
35
|
+
if (period.end < next_start)
|
|
36
|
+
next_start = period.end;
|
|
37
|
+
end = namirasoft_core_1.TimeOperation.secondsAgo(1, next_start);
|
|
37
38
|
if (trial_ends_at) {
|
|
38
39
|
if (trial_ends_at < period.start)
|
|
39
40
|
yield estimate_hour({ start, end }, false);
|
|
@@ -49,7 +50,7 @@ class TimeUtil {
|
|
|
49
50
|
}
|
|
50
51
|
else
|
|
51
52
|
yield estimate_hour({ start, end }, false);
|
|
52
|
-
start =
|
|
53
|
+
start = next_start;
|
|
53
54
|
} while (end < period.end);
|
|
54
55
|
});
|
|
55
56
|
}
|
package/dist/TimeUtil.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TimeUtil.js","sourceRoot":"","sources":["../src/TimeUtil.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qDAAmE;AAInE,MAAa,QAAQ;IAEjB,MAAM,CAAC,WAAW,CAAC,KAAY;QAE3B,OAAO,mCAAiB,CAAC,KAAK,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC,QAAQ,CAAC,IAAW,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC;IACvG,CAAC;IACD,MAAM,CAAC,OAAO,CAAC,KAAY,EAAE,IAAU;QAEnC,OAAO,IAAI,IAAI,QAAQ,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;IAC/C,CAAC;IACD,MAAM,CAAO,UAAU,CAAC,KAAmB,EAAE,MAAc,EAAE,aAAgE;;YAEzH,IAAI,MAAM,CAAC,GAAG,IAAI,MAAM,CAAC,KAAK;gBAC1B,OAAO;YAEX,IAAI,aAAa,GAAgB,IAAI,CAAC;YACtC,IAAI,KAAK;gBACL,aAAa,GAAG,QAAQ,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;YAEhD,IAAI,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC;YACzB,IAAI,GAAG,GAAG,IAAI,CAAC;YAEf,GACA,CAAC;gBACG,
|
|
1
|
+
{"version":3,"file":"TimeUtil.js","sourceRoot":"","sources":["../src/TimeUtil.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qDAAmE;AAInE,MAAa,QAAQ;IAEjB,MAAM,CAAC,WAAW,CAAC,KAAY;QAE3B,OAAO,mCAAiB,CAAC,KAAK,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC,QAAQ,CAAC,IAAW,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC;IACvG,CAAC;IACD,MAAM,CAAC,OAAO,CAAC,KAAY,EAAE,IAAU;QAEnC,OAAO,IAAI,IAAI,QAAQ,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;IAC/C,CAAC;IACD,MAAM,CAAO,UAAU,CAAC,KAAmB,EAAE,MAAc,EAAE,aAAgE;;YAEzH,IAAI,MAAM,CAAC,GAAG,IAAI,MAAM,CAAC,KAAK;gBAC1B,OAAO;YAEX,IAAI,aAAa,GAAgB,IAAI,CAAC;YACtC,IAAI,KAAK;gBACL,aAAa,GAAG,QAAQ,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;YAEhD,IAAI,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC;YACzB,IAAI,GAAG,GAAG,IAAI,CAAC;YAEf,GACA,CAAC;gBACG,IAAI,UAAU,GAAG,+BAAa,CAAC,UAAU,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;gBACpD,UAAU,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC;gBAC9B,UAAU,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;gBACzB,UAAU,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;gBACzB,IAAI,MAAM,CAAC,GAAG,GAAG,UAAU;oBACvB,UAAU,GAAG,MAAM,CAAC,GAAG,CAAC;gBAC5B,GAAG,GAAG,+BAAa,CAAC,UAAU,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC;gBAC9C,IAAI,aAAa,EACjB,CAAC;oBACG,IAAI,aAAa,GAAG,MAAM,CAAC,KAAK;wBAC5B,MAAM,aAAa,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE,KAAK,CAAC,CAAC;yBAC1C,IAAI,aAAa,IAAI,MAAM,CAAC,GAAG,EACpC,CAAC;wBACG,IAAI,eAAe,GAAG,+BAAa,CAAC,UAAU,CAAC,CAAC,EAAE,aAAa,CAAC,CAAC;wBACjE,IAAI,eAAe,GAAG,aAAa,CAAC;wBACpC,IAAI,KAAK,GAAG,eAAe;4BACvB,MAAM,aAAa,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE,eAAe,EAAE,EAAE,IAAI,CAAC,CAAC;wBAC/D,MAAM,aAAa,CAAC,EAAE,KAAK,EAAE,eAAe,EAAE,GAAG,EAAE,EAAE,KAAK,CAAC,CAAC;oBAChE,CAAC;yBACI,IAAI,MAAM,CAAC,GAAG,GAAG,aAAa;wBAC/B,MAAM,aAAa,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,GAAG,EAAE,aAAa,EAAE,EAAE,IAAI,CAAC,CAAC;gBAC/E,CAAC;;oBAEG,MAAM,aAAa,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE,KAAK,CAAC,CAAC;gBAC/C,KAAK,GAAG,UAAU,CAAC;YACvB,CAAC,QACM,GAAG,GAAG,MAAM,CAAC,GAAG,EAAC;QAC5B,CAAC;KAAA;CACJ;AApDD,4BAoDC"}
|
package/package.json
CHANGED
package/src/TimeUtil.ts
CHANGED
|
@@ -26,12 +26,13 @@ export class TimeUtil
|
|
|
26
26
|
|
|
27
27
|
do
|
|
28
28
|
{
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
if (period.end <
|
|
34
|
-
|
|
29
|
+
let next_start = TimeOperation.hoursLater(1, start);
|
|
30
|
+
next_start.setMilliseconds(0);
|
|
31
|
+
next_start.setSeconds(0);
|
|
32
|
+
next_start.setMinutes(0);
|
|
33
|
+
if (period.end < next_start)
|
|
34
|
+
next_start = period.end;
|
|
35
|
+
end = TimeOperation.secondsAgo(1, next_start);
|
|
35
36
|
if (trial_ends_at)
|
|
36
37
|
{
|
|
37
38
|
if (trial_ends_at < period.start)
|
|
@@ -49,7 +50,7 @@ export class TimeUtil
|
|
|
49
50
|
}
|
|
50
51
|
else
|
|
51
52
|
await estimate_hour({ start, end }, false);
|
|
52
|
-
start =
|
|
53
|
+
start = next_start;
|
|
53
54
|
}
|
|
54
55
|
while (end < period.end)
|
|
55
56
|
}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import { EstimationUsage } from "./EstimationUsage";
|
|
2
2
|
import { Period } from "./Period";
|
|
3
3
|
|
|
4
|
-
export type EstimationRow =
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
4
|
+
export type EstimationRow = {
|
|
5
|
+
period: Period;
|
|
6
|
+
usage: EstimationUsage;
|
|
7
|
+
amount: number;
|
|
8
|
+
free: boolean;
|
|
9
|
+
free_reason: string;
|
|
10
|
+
};
|