lib_angar_new 2.0.30 → 2.0.32

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.
Files changed (9) hide show
  1. package/lib_angar/InOut/ClsInOut.d.ts +1 -0
  2. package/lib_angar/InOut/ClsInOut.js +12 -0
  3. package/lib_angar/InOut/ClsInOut.js.map +1 -1
  4. package/lib_angar/InOut/ClsInOut.ts +112 -107
  5. package/lib_angar/InOut/ClsInOutRoot.d.ts +1 -0
  6. package/lib_angar/InOut/ClsInOutRoot.js +5 -0
  7. package/lib_angar/InOut/ClsInOutRoot.js.map +1 -1
  8. package/lib_angar/InOut/ClsInOutRoot.ts +23 -21
  9. package/package.json +1 -1
package/lib_angar/InOut/ClsInOut.d.ts CHANGED
@@ -7,6 +7,7 @@ export declare class ClsInOut extends Serializable {
7
7
  DayHour: number;
8
8
  NightHour: number;
9
9
  Schedule: number;
10
+ Nutrition: number;
10
11
  constructor();
11
12
  /**
12
13
  * Конвертируем список классов ClsInOut в json string
package/lib_angar/InOut/ClsInOut.js CHANGED
@@ -23,6 +23,7 @@ let ClsInOut = ClsInOut_1 = class ClsInOut extends ts_serializer_1.Serializable
23
23
  this.DayHour = 0;
24
24
  this.NightHour = 0;
25
25
  this.Schedule = 0;
26
+ this.Nutrition = 0;
26
27
  }
27
28
  /**
28
29
  * Конвертируем список классов ClsInOut в json string
@@ -88,6 +89,13 @@ let ClsInOut = ClsInOut_1 = class ClsInOut extends ts_serializer_1.Serializable
88
89
  tableField.ComponentName = "";
89
90
  tableField.Width = "50";
90
91
  arrayTableField.ArrayFields.push(tableField);
92
+ tableField = new TableField_1.TableField();
93
+ tableField.Field = "Nutrition";
94
+ tableField.ColumnName = "Питание";
95
+ tableField.ShowDefault = true;
96
+ tableField.ComponentName = "";
97
+ tableField.Width = "60";
98
+ arrayTableField.ArrayFields.push(tableField);
91
99
  return arrayTableField;
92
100
  }
93
101
  };
@@ -116,6 +124,10 @@ __decorate([
116
124
  (0, ts_serializer_1.SerializeProperty)({ map: "Schedule", optional: true }),
117
125
  __metadata("design:type", Number)
118
126
  ], ClsInOut.prototype, "Schedule", void 0);
127
+ __decorate([
128
+ (0, ts_serializer_1.SerializeProperty)({ map: "Nutrition", optional: true }),
129
+ __metadata("design:type", Number)
130
+ ], ClsInOut.prototype, "Nutrition", void 0);
119
131
  exports.ClsInOut = ClsInOut = ClsInOut_1 = __decorate([
120
132
  (0, ts_serializer_1.Serialize)({}),
121
133
  __metadata("design:paramtypes", [])
package/lib_angar/InOut/ClsInOut.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"ClsInOut.js","sourceRoot":"","sources":["ClsInOut.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"ClsInOut.js","sourceRoot":"","sources":["ClsInOut.ts"],"names":[],"mappings":"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"}
package/lib_angar/InOut/ClsInOut.ts CHANGED
@@ -3,115 +3,120 @@ import { ArrayTableField } from "../ViewProperty/ArrayTableField";
3
3
  import { TableField } from "../ViewProperty/TableField";
4
4
 
5
5
  @Serialize({})
6
- export class ClsInOut extends Serializable
7
- {
8
- @SerializeProperty({ map: "Id", optional: true })
9
- public Id: number;
10
-
11
- @SerializeProperty({ map: "DateStart", optional: true })
12
- public DateStart: Date;
13
-
14
- @SerializeProperty({ map: "DateEnd", optional: true })
15
- public DateEnd: Date;
16
-
17
- @SerializeProperty({ map: "DayHour", optional: true })
18
- public DayHour: number;
19
-
20
- @SerializeProperty({ map: "NightHour", optional: true })
21
- public NightHour: number;
22
-
23
- @SerializeProperty({ map: "Schedule", optional: true })
24
- public Schedule: number;
25
-
26
- constructor()
27
- {
28
- super();
29
- this.Id = 0;
30
- this.DateStart = new Date();
31
- this.DateEnd = new Date();
32
- this.DayHour = 0;
33
- this.NightHour = 0;
34
- this.Schedule = 0;
35
- }
36
-
37
- /**
6
+ export class ClsInOut extends Serializable {
7
+ @SerializeProperty({ map: "Id", optional: true })
8
+ public Id: number;
9
+
10
+ @SerializeProperty({ map: "DateStart", optional: true })
11
+ public DateStart: Date;
12
+
13
+ @SerializeProperty({ map: "DateEnd", optional: true })
14
+ public DateEnd: Date;
15
+
16
+ @SerializeProperty({ map: "DayHour", optional: true })
17
+ public DayHour: number;
18
+
19
+ @SerializeProperty({ map: "NightHour", optional: true })
20
+ public NightHour: number;
21
+
22
+ @SerializeProperty({ map: "Schedule", optional: true })
23
+ public Schedule: number;
24
+
25
+ @SerializeProperty({ map: "Nutrition", optional: true })
26
+ public Nutrition: number;
27
+
28
+ constructor() {
29
+ super();
30
+ this.Id = 0;
31
+ this.DateStart = new Date();
32
+ this.DateEnd = new Date();
33
+ this.DayHour = 0;
34
+ this.NightHour = 0;
35
+ this.Schedule = 0;
36
+ this.Nutrition = 0;
37
+ }
38
+
39
+ /**
38
40
  * Конвертируем список классов ClsInOut в json string
39
41
  * @param listClsUser
40
42
  */
41
- ArrayClsInOutToJson(listClsInOut: Array<ClsInOut>)
42
- {
43
- const arrayObject: Array<object> = new Array<object>();
44
- listClsInOut.forEach((item: ClsInOut) =>
45
- {
46
- const row: object = item.serialize();
47
- arrayObject.push(row);
48
- });
49
- return JSON.stringify(arrayObject);
50
- }
51
-
52
- /**
53
- * Конвертируем список объектов в Array<ClsInOut>
54
- * @param arrayObject
55
- * @returns
56
- */
57
- ArrayObjectToListClsInOut(arrayObject: Array<object>): Array<ClsInOut>
58
- {
59
- const listClsInOut: Array<ClsInOut> = new Array<ClsInOut>();
60
- arrayObject.forEach((item: object) =>
61
- {
62
- const clsInOut: ClsInOut = new ClsInOut();
63
- clsInOut.deserialize(item);
64
- listClsInOut.push(clsInOut);
65
- })
66
- return listClsInOut;
67
- }
68
-
69
- ShowTable()
70
- {
71
- const arrayTableField: ArrayTableField = new ArrayTableField();
72
-
73
- let tableField: TableField = new TableField();
74
- tableField.Field = "DateStart";
75
- tableField.ColumnName = "Вход";
76
- tableField.ShowDefault = true;
77
- tableField.ComponentName = "";
78
- tableField.Width = "130";
79
- arrayTableField.ArrayFields.push(tableField);
80
-
81
- tableField = new TableField();
82
- tableField.Field = "DateEnd";
83
- tableField.ColumnName = "Выход";
84
- tableField.ShowDefault = true;
85
- tableField.ComponentName = "";
86
- tableField.Width = "130";
87
- arrayTableField.ArrayFields.push(tableField);
88
-
89
- tableField = new TableField();
90
- tableField.Field = "Plan";
91
- tableField.ColumnName = "Факт";
92
- tableField.ShowDefault = true;
93
- tableField.ComponentName = "";
94
- tableField.Width = "100";
95
- tableField.Group = ["DayHour", "NightHour"];
96
- arrayTableField.ArrayFields.push(tableField);
97
-
98
- tableField = new TableField();
99
- tableField.Field = "DayHour";
100
- tableField.ColumnName = "День";
101
- tableField.ShowDefault = true;
102
- tableField.ComponentName = "";
103
- tableField.Width = "50";
104
- arrayTableField.ArrayFields.push(tableField);
105
-
106
- tableField = new TableField();
107
- tableField.Field = "NightHour";
108
- tableField.ColumnName = "Ночь";
109
- tableField.ShowDefault = true;
110
- tableField.ComponentName = "";
111
- tableField.Width = "50";
112
- arrayTableField.ArrayFields.push(tableField);
113
-
114
- return arrayTableField;
115
- }
43
+ ArrayClsInOutToJson(listClsInOut: Array<ClsInOut>) {
44
+ const arrayObject: Array<object> = new Array<object>();
45
+ listClsInOut.forEach((item: ClsInOut) => {
46
+ const row: object = item.serialize();
47
+ arrayObject.push(row);
48
+ });
49
+ return JSON.stringify(arrayObject);
50
+ }
51
+
52
+ /**
53
+ * Конвертируем список объектов в Array<ClsInOut>
54
+ * @param arrayObject
55
+ * @returns
56
+ */
57
+ ArrayObjectToListClsInOut(arrayObject: Array<object>): Array<ClsInOut> {
58
+ const listClsInOut: Array<ClsInOut> = new Array<ClsInOut>();
59
+ arrayObject.forEach((item: object) => {
60
+ const clsInOut: ClsInOut = new ClsInOut();
61
+ clsInOut.deserialize(item);
62
+ listClsInOut.push(clsInOut);
63
+ })
64
+ return listClsInOut;
65
+ }
66
+
67
+ ShowTable() {
68
+ const arrayTableField: ArrayTableField = new ArrayTableField();
69
+
70
+ let tableField: TableField = new TableField();
71
+ tableField.Field = "DateStart";
72
+ tableField.ColumnName = "Вход";
73
+ tableField.ShowDefault = true;
74
+ tableField.ComponentName = "";
75
+ tableField.Width = "130";
76
+ arrayTableField.ArrayFields.push(tableField);
77
+
78
+ tableField = new TableField();
79
+ tableField.Field = "DateEnd";
80
+ tableField.ColumnName = "Выход";
81
+ tableField.ShowDefault = true;
82
+ tableField.ComponentName = "";
83
+ tableField.Width = "130";
84
+ arrayTableField.ArrayFields.push(tableField);
85
+
86
+ tableField = new TableField();
87
+ tableField.Field = "Plan";
88
+ tableField.ColumnName = "Факт";
89
+ tableField.ShowDefault = true;
90
+ tableField.ComponentName = "";
91
+ tableField.Width = "100";
92
+ tableField.Group = ["DayHour", "NightHour"];
93
+ arrayTableField.ArrayFields.push(tableField);
94
+
95
+ tableField = new TableField();
96
+ tableField.Field = "DayHour";
97
+ tableField.ColumnName = "День";
98
+ tableField.ShowDefault = true;
99
+ tableField.ComponentName = "";
100
+ tableField.Width = "50";
101
+ arrayTableField.ArrayFields.push(tableField);
102
+
103
+ tableField = new TableField();
104
+ tableField.Field = "NightHour";
105
+ tableField.ColumnName = "Ночь";
106
+ tableField.ShowDefault = true;
107
+ tableField.ComponentName = "";
108
+ tableField.Width = "50";
109
+ arrayTableField.ArrayFields.push(tableField);
110
+
111
+ tableField = new TableField();
112
+ tableField.Field = "Nutrition";
113
+ tableField.ColumnName = "Питание";
114
+ tableField.ShowDefault = true;
115
+ tableField.ComponentName = "";
116
+ tableField.Width = "60";
117
+ arrayTableField.ArrayFields.push(tableField);
118
+
119
+ return arrayTableField;
120
+ }
116
121
  }
117
122
 
package/lib_angar/InOut/ClsInOutRoot.d.ts CHANGED
@@ -5,6 +5,7 @@ export declare class ClsInOutRoot extends Serializable {
5
5
  Total: number;
6
6
  DaySumma: number;
7
7
  NightSumma: number;
8
+ Nutrition: number;
8
9
  ArrClsInOut: Array<ClsInOut>;
9
10
  constructor();
10
11
  }
package/lib_angar/InOut/ClsInOutRoot.js CHANGED
@@ -19,6 +19,7 @@ let ClsInOutRoot = class ClsInOutRoot extends ts_serializer_1.Serializable {
19
19
  this.Total = 0;
20
20
  this.DaySumma = 0;
21
21
  this.NightSumma = 0;
22
+ this.Nutrition = 0;
22
23
  this.ArrClsInOut = new Array();
23
24
  }
24
25
  };
@@ -39,6 +40,10 @@ __decorate([
39
40
  (0, ts_serializer_1.SerializeProperty)({ map: "NightSumma", optional: true }),
40
41
  __metadata("design:type", Number)
41
42
  ], ClsInOutRoot.prototype, "NightSumma", void 0);
43
+ __decorate([
44
+ (0, ts_serializer_1.SerializeProperty)({ map: "Nutrition", optional: true }),
45
+ __metadata("design:type", Number)
46
+ ], ClsInOutRoot.prototype, "Nutrition", void 0);
42
47
  __decorate([
43
48
  (0, ts_serializer_1.SerializeProperty)({ map: "List", type: ClsInOut_1.ClsInOut, list: true, optional: true }),
44
49
  __metadata("design:type", Array)
package/lib_angar/InOut/ClsInOutRoot.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"ClsInOutRoot.js","sourceRoot":"","sources":["ClsInOutRoot.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,iDAA2E;AAC3E,yCAAsC;AAG/B,IAAM,YAAY,GAAlB,MAAM,YAAa,SAAQ,4BAAY;IAiB7C;QAEC,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,QAAQ,GAAG,CAAC,CAAC;QAClB,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC;QACf,IAAI,CAAC,QAAQ,GAAG,CAAC,CAAC;QAClB,IAAI,CAAC,UAAU,GAAG,CAAC,CAAC;QACpB,IAAI,CAAC,WAAW,GAAG,IAAI,KAAK,EAAY,CAAC;IAC1C,CAAC;CACD,CAAA;AA1BY,oCAAY;AAGjB;IADN,IAAA,iCAAiB,EAAC,EAAE,GAAG,EAAE,UAAU,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;8CAC/B;AAGjB;IADN,IAAA,iCAAiB,EAAC,EAAE,GAAG,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;2CAC/B;AAGd;IADN,IAAA,iCAAiB,EAAC,EAAE,GAAG,EAAE,UAAU,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;8CAC/B;AAGjB;IADN,IAAA,iCAAiB,EAAC,EAAE,GAAG,EAAE,YAAY,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;gDAC/B;AAGnB;IADN,IAAA,iCAAiB,EAAC,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,mBAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BAC3D,KAAK;iDAAW;uBAfxB,YAAY;IADxB,IAAA,yBAAS,EAAC,EAAE,CAAC;;GACD,YAAY,CA0BxB"}
1
+ {"version":3,"file":"ClsInOutRoot.js","sourceRoot":"","sources":["ClsInOutRoot.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,iDAA2E;AAC3E,yCAAsC;AAG/B,IAAM,YAAY,GAAlB,MAAM,YAAa,SAAQ,4BAAY;IAmB1C;QACI,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,QAAQ,GAAG,CAAC,CAAC;QAClB,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC;QACf,IAAI,CAAC,QAAQ,GAAG,CAAC,CAAC;QAClB,IAAI,CAAC,UAAU,GAAG,CAAC,CAAC;QACpB,IAAI,CAAC,SAAS,GAAG,CAAC,CAAC;QACnB,IAAI,CAAC,WAAW,GAAG,IAAI,KAAK,EAAY,CAAC;IAC7C,CAAC;CACJ,CAAA;AA5BY,oCAAY;AAEd;IADN,IAAA,iCAAiB,EAAC,EAAE,GAAG,EAAE,UAAU,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;8CAC/B;AAGjB;IADN,IAAA,iCAAiB,EAAC,EAAE,GAAG,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;2CAC/B;AAGd;IADN,IAAA,iCAAiB,EAAC,EAAE,GAAG,EAAE,UAAU,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;8CAC/B;AAGjB;IADN,IAAA,iCAAiB,EAAC,EAAE,GAAG,EAAE,YAAY,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;gDAC/B;AAGnB;IADN,IAAA,iCAAiB,EAAC,EAAE,GAAG,EAAE,WAAW,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;+CAC/B;AAGlB;IADN,IAAA,iCAAiB,EAAC,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,mBAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BAC3D,KAAK;iDAAW;uBAjB3B,YAAY;IADxB,IAAA,yBAAS,EAAC,EAAE,CAAC;;GACD,YAAY,CA4BxB"}
package/lib_angar/InOut/ClsInOutRoot.ts CHANGED
@@ -2,30 +2,32 @@ import { Serializable, Serialize, SerializeProperty } from "ts-serializer";
2
2
  import { ClsInOut } from "./ClsInOut";
3
3
 
4
4
  @Serialize({})
5
- export class ClsInOutRoot extends Serializable
6
- {
7
- @SerializeProperty({ map: "WorkHour", optional: true })
8
- public WorkHour: number;
5
+ export class ClsInOutRoot extends Serializable {
6
+ @SerializeProperty({ map: "WorkHour", optional: true })
7
+ public WorkHour: number;
9
8
 
10
- @SerializeProperty({ map: "Total", optional: true })
11
- public Total: number;
9
+ @SerializeProperty({ map: "Total", optional: true })
10
+ public Total: number;
12
11
 
13
- @SerializeProperty({ map: "DaySumma", optional: true })
14
- public DaySumma: number;
12
+ @SerializeProperty({ map: "DaySumma", optional: true })
13
+ public DaySumma: number;
15
14
 
16
- @SerializeProperty({ map: "NightSumma", optional: true })
17
- public NightSumma: number;
15
+ @SerializeProperty({ map: "NightSumma", optional: true })
16
+ public NightSumma: number;
18
17
 
19
- @SerializeProperty({ map: "List", type: ClsInOut, list: true, optional: true })
20
- public ArrClsInOut: Array<ClsInOut>;
18
+ @SerializeProperty({ map: "Nutrition", optional: true })
19
+ public Nutrition: number;
21
20
 
22
- constructor()
23
- {
24
- super();
25
- this.WorkHour = 0;
26
- this.Total = 0;
27
- this.DaySumma = 0;
28
- this.NightSumma = 0;
29
- this.ArrClsInOut = new Array<ClsInOut>();
30
- }
21
+ @SerializeProperty({ map: "List", type: ClsInOut, list: true, optional: true })
22
+ public ArrClsInOut: Array<ClsInOut>;
23
+
24
+ constructor() {
25
+ super();
26
+ this.WorkHour = 0;
27
+ this.Total = 0;
28
+ this.DaySumma = 0;
29
+ this.NightSumma = 0;
30
+ this.Nutrition = 0;
31
+ this.ArrClsInOut = new Array<ClsInOut>();
32
+ }
31
33
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "lib_angar_new",
3
- "version": "2.0.30",
3
+ "version": "2.0.32",
4
4
  "description": "lib_angar",
5
5
  "main": "lib_angar/index.js",
6
6
  "types": "lib_angar/index.d.ts",