avvir 3.4.6 → 3.4.8
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/avvir_api.node.js +20 -9
- package/dist/esm/api/report_api.d.ts +3 -1
- package/dist/esm/api/report_api.js +12 -1
- package/dist/esm/api/report_api.js.map +1 -1
- package/dist/esm/models/api/api_scan_dataset.d.ts +12 -9
- package/dist/esm/models/api/api_scan_dataset.js +6 -8
- package/dist/esm/models/api/api_scan_dataset.js.map +1 -1
- package/package.json +1 -1
- package/source/api/report_api.ts +12 -1
- package/source/models/api/api_scan_dataset.ts +34 -31
package/dist/avvir_api.node.js
CHANGED
|
@@ -1214,9 +1214,12 @@ var ReportApi = /** @class */ (function () {
|
|
|
1214
1214
|
var url = _utilities_http__WEBPACK_IMPORTED_MODULE_1__["default"].baseUrl() + "/projects/" + projectId + "/reports";
|
|
1215
1215
|
return _utilities_http__WEBPACK_IMPORTED_MODULE_1__["default"].post(url, user, report);
|
|
1216
1216
|
};
|
|
1217
|
-
ReportApi.listInspectReports = function (_a, user) {
|
|
1217
|
+
ReportApi.listInspectReports = function (_a, user, displayEntries) {
|
|
1218
1218
|
var projectId = _a.projectId;
|
|
1219
1219
|
var url = _utilities_http__WEBPACK_IMPORTED_MODULE_1__["default"].baseUrl() + "/projects/" + projectId + "/reports";
|
|
1220
|
+
if (displayEntries) {
|
|
1221
|
+
url += "?displayEntries=true";
|
|
1222
|
+
}
|
|
1220
1223
|
return _utilities_http__WEBPACK_IMPORTED_MODULE_1__["default"].get(url, user);
|
|
1221
1224
|
};
|
|
1222
1225
|
ReportApi.listInspectReportEntries = function (_a, user) {
|
|
@@ -1234,6 +1237,16 @@ var ReportApi = /** @class */ (function () {
|
|
|
1234
1237
|
var url = _utilities_http__WEBPACK_IMPORTED_MODULE_1__["default"].baseUrl() + "/projects/" + projectId + "/reports/" + inspectReportId + "/inspect-entries/" + inspectReportEntryId;
|
|
1235
1238
|
return _utilities_http__WEBPACK_IMPORTED_MODULE_1__["default"].put(url, user, reportEntry);
|
|
1236
1239
|
};
|
|
1240
|
+
ReportApi.updateInspectReport = function (_a, report, user) {
|
|
1241
|
+
var projectId = _a.projectId, inspectReportId = _a.inspectReportId;
|
|
1242
|
+
var url = _utilities_http__WEBPACK_IMPORTED_MODULE_1__["default"].baseUrl() + "/projects/" + projectId + "/reports/" + inspectReportId;
|
|
1243
|
+
return _utilities_http__WEBPACK_IMPORTED_MODULE_1__["default"].put(url, user, report);
|
|
1244
|
+
};
|
|
1245
|
+
ReportApi.deleteInspectReport = function (_a, user) {
|
|
1246
|
+
var projectId = _a.projectId, inspectReportId = _a.inspectReportId;
|
|
1247
|
+
var url = _utilities_http__WEBPACK_IMPORTED_MODULE_1__["default"].baseUrl() + "/projects/" + projectId + "/reports/" + inspectReportId;
|
|
1248
|
+
return _utilities_http__WEBPACK_IMPORTED_MODULE_1__["default"]["delete"](url, user);
|
|
1249
|
+
};
|
|
1237
1250
|
return ReportApi;
|
|
1238
1251
|
}());
|
|
1239
1252
|
/* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = (ReportApi);
|
|
@@ -4830,7 +4843,7 @@ var ApiScanDatasetQaState;
|
|
|
4830
4843
|
})(ApiScanDatasetQaState || (ApiScanDatasetQaState = {}));
|
|
4831
4844
|
var ApiScanDataset = /** @class */ (function () {
|
|
4832
4845
|
function ApiScanDataset(_a) {
|
|
4833
|
-
var id = _a.id, firebaseId = _a.firebaseId, firebaseFloorId = _a.firebaseFloorId, scanNumber = _a.scanNumber, dataPresences = _a.dataPresences, analysisCompleted = _a.analysisCompleted,
|
|
4846
|
+
var id = _a.id, firebaseId = _a.firebaseId, firebaseFloorId = _a.firebaseFloorId, scanNumber = _a.scanNumber, dataPresences = _a.dataPresences, analysisCompleted = _a.analysisCompleted, manualAnalysisSkipped = _a.manualAnalysisSkipped, notes = _a.notes, name = _a.name, coarseAlignmentMatrix = _a.coarseAlignmentMatrix, fineAlignmentMatrix = _a.fineAlignmentMatrix, scanDate = _a.scanDate, scanDateString = _a.scanDateString, qaStarted = _a.qaStarted, qaComplete = _a.qaComplete, qaState = _a.qaState;
|
|
4834
4847
|
/**
|
|
4835
4848
|
* Date that the dataset was captured.
|
|
4836
4849
|
*/
|
|
@@ -4850,7 +4863,11 @@ var ApiScanDataset = /** @class */ (function () {
|
|
|
4850
4863
|
* gateway so the frontend doesn't need to replicate business logic
|
|
4851
4864
|
*/
|
|
4852
4865
|
this.qaState = null;
|
|
4853
|
-
(0,_mixins_add_instant_getter_and_setter_to_api_model__WEBPACK_IMPORTED_MODULE_1__["default"])(this, "scanDate");
|
|
4866
|
+
(0,_mixins_add_instant_getter_and_setter_to_api_model__WEBPACK_IMPORTED_MODULE_1__["default"])(this, "scanDate", scanDate);
|
|
4867
|
+
(0,_mixins_add_instant_getter_and_setter_to_api_model__WEBPACK_IMPORTED_MODULE_1__["default"])(this, "qaStarted", qaStarted);
|
|
4868
|
+
(0,_mixins_add_instant_getter_and_setter_to_api_model__WEBPACK_IMPORTED_MODULE_1__["default"])(this, "qaComplete", qaComplete);
|
|
4869
|
+
(0,_mixins_add_instant_getter_and_setter_to_api_model__WEBPACK_IMPORTED_MODULE_1__["default"])(this, "analysisCompleted", analysisCompleted);
|
|
4870
|
+
(0,_mixins_add_instant_getter_and_setter_to_api_model__WEBPACK_IMPORTED_MODULE_1__["default"])(this, "manualAnalysisSkipped", manualAnalysisSkipped);
|
|
4854
4871
|
(0,_mixins_add_read_only_properties_to_model__WEBPACK_IMPORTED_MODULE_3__["default"])(this, { id: id, firebaseId: firebaseId, firebaseFloorId: firebaseFloorId, scanNumber: scanNumber });
|
|
4855
4872
|
var coarseAlignmentMatrixVal, fineAlignmentMatrixVal;
|
|
4856
4873
|
Object.defineProperties(this, {
|
|
@@ -4898,13 +4915,7 @@ var ApiScanDataset = /** @class */ (function () {
|
|
|
4898
4915
|
}
|
|
4899
4916
|
this.notes = notes;
|
|
4900
4917
|
this.name = name;
|
|
4901
|
-
// @ts-ignore
|
|
4902
|
-
this.scanDate = scanDate;
|
|
4903
4918
|
this.scanDateString = scanDateString;
|
|
4904
|
-
this.analysisCompleted = analysisCompleted;
|
|
4905
|
-
this.manualQcPresent = manualQcPresent;
|
|
4906
|
-
this.qaStarted = qaStarted;
|
|
4907
|
-
this.qaComplete = qaComplete;
|
|
4908
4919
|
this.qaState = qaState;
|
|
4909
4920
|
}
|
|
4910
4921
|
return ApiScanDataset;
|
|
@@ -3,8 +3,10 @@ import { User } from "../utilities/get_authorization_headers";
|
|
|
3
3
|
import { ApiInspectReport, ApiInspectReportEntry } from "../models";
|
|
4
4
|
export default class ReportApi {
|
|
5
5
|
static createInspectReport({ projectId }: AssociationIds, report: ApiInspectReport, user: User): Promise<ApiInspectReport>;
|
|
6
|
-
static listInspectReports({ projectId }: AssociationIds, user: User): Promise<ApiInspectReport[]>;
|
|
6
|
+
static listInspectReports({ projectId }: AssociationIds, user: User, displayEntries?: boolean): Promise<ApiInspectReport[]>;
|
|
7
7
|
static listInspectReportEntries({ projectId, inspectReportId }: AssociationIds, user: User): Promise<ApiInspectReportEntry[]>;
|
|
8
8
|
static createInspectReportEntries({ projectId, inspectReportId }: AssociationIds, reportEntries: ApiInspectReportEntry[], user: User): Promise<ApiInspectReportEntry[]>;
|
|
9
9
|
static updateInspectReportEntry({ projectId, inspectReportId, inspectReportEntryId }: AssociationIds, reportEntry: any, user: any): Promise<ApiInspectReportEntry>;
|
|
10
|
+
static updateInspectReport({ projectId, inspectReportId }: AssociationIds, report: any, user: any): Promise<ApiInspectReport>;
|
|
11
|
+
static deleteInspectReport({ projectId, inspectReportId }: AssociationIds, user: any): Promise<void>;
|
|
10
12
|
}
|
|
@@ -5,8 +5,11 @@ export default class ReportApi {
|
|
|
5
5
|
let url = `${Http.baseUrl()}/projects/${projectId}/reports`;
|
|
6
6
|
return Http.post(url, user, report);
|
|
7
7
|
}
|
|
8
|
-
static listInspectReports({ projectId }, user) {
|
|
8
|
+
static listInspectReports({ projectId }, user, displayEntries) {
|
|
9
9
|
let url = `${Http.baseUrl()}/projects/${projectId}/reports`;
|
|
10
|
+
if (displayEntries) {
|
|
11
|
+
url += "?displayEntries=true";
|
|
12
|
+
}
|
|
10
13
|
return Http.get(url, user);
|
|
11
14
|
}
|
|
12
15
|
static listInspectReportEntries({ projectId, inspectReportId }, user) {
|
|
@@ -21,6 +24,14 @@ export default class ReportApi {
|
|
|
21
24
|
let url = `${Http.baseUrl()}/projects/${projectId}/reports/${inspectReportId}/inspect-entries/${inspectReportEntryId}`;
|
|
22
25
|
return Http.put(url, user, reportEntry);
|
|
23
26
|
}
|
|
27
|
+
static updateInspectReport({ projectId, inspectReportId }, report, user) {
|
|
28
|
+
let url = `${Http.baseUrl()}/projects/${projectId}/reports/${inspectReportId}`;
|
|
29
|
+
return Http.put(url, user, report);
|
|
30
|
+
}
|
|
31
|
+
static deleteInspectReport({ projectId, inspectReportId }, user) {
|
|
32
|
+
let url = `${Http.baseUrl()}/projects/${projectId}/reports/${inspectReportId}`;
|
|
33
|
+
return Http.delete(url, user);
|
|
34
|
+
}
|
|
24
35
|
}
|
|
25
36
|
makeErrorsPretty(ReportApi);
|
|
26
37
|
//# sourceMappingURL=report_api.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"report_api.js","sourceRoot":"","sources":["../../../source/api/report_api.ts"],"names":[],"mappings":"AAAA,OAAO,gBAAgB,MAAM,iCAAiC,CAAC;AAG/D,OAAO,IAAI,MAAM,mBAAmB,CAAC;AAGrC,MAAM,CAAC,OAAO,OAAO,SAAS;IAC1B,MAAM,CAAC,mBAAmB,CAAC,EAAE,SAAS,EAAkB,EAAE,MAAwB,EAAE,IAAU;QAC1F,IAAI,GAAG,GAAG,GAAG,IAAI,CAAC,OAAO,EAAE,aAAa,SAAS,UAAU,CAAC;QAC5D,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,EAAE,MAAM,CAAyC,CAAC;IAChF,CAAC;IACD,MAAM,CAAC,kBAAkB,CAAC,EAAC,SAAS,EAAiB,EAAE,IAAU;
|
|
1
|
+
{"version":3,"file":"report_api.js","sourceRoot":"","sources":["../../../source/api/report_api.ts"],"names":[],"mappings":"AAAA,OAAO,gBAAgB,MAAM,iCAAiC,CAAC;AAG/D,OAAO,IAAI,MAAM,mBAAmB,CAAC;AAGrC,MAAM,CAAC,OAAO,OAAO,SAAS;IAC1B,MAAM,CAAC,mBAAmB,CAAC,EAAE,SAAS,EAAkB,EAAE,MAAwB,EAAE,IAAU;QAC1F,IAAI,GAAG,GAAG,GAAG,IAAI,CAAC,OAAO,EAAE,aAAa,SAAS,UAAU,CAAC;QAC5D,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,EAAE,MAAM,CAAyC,CAAC;IAChF,CAAC;IACD,MAAM,CAAC,kBAAkB,CAAC,EAAC,SAAS,EAAiB,EAAE,IAAU,EAAE,cAAwB;QACvF,IAAI,GAAG,GAAG,GAAG,IAAI,CAAC,OAAO,EAAE,aAAa,SAAS,UAAU,CAAC;QAC5D,IAAI,cAAc,EAAE;YAChB,GAAG,IAAI,sBAAsB,CAAC;SACjC;QACD,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAA2C,CAAC;IACzE,CAAC;IACD,MAAM,CAAC,wBAAwB,CAAC,EAAC,SAAS,EAAE,eAAe,EAAiB,EAAE,IAAU;QACpF,IAAI,GAAG,GAAG,GAAG,IAAI,CAAC,OAAO,EAAE,aAAa,SAAS,YAAY,eAAe,kBAAkB,CAAC;QAC/F,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAgD,CAAC;IAC9E,CAAC;IACD,MAAM,CAAC,0BAA0B,CAAC,EAAE,SAAS,EAAE,eAAe,EAAkB,EAAE,aAAsC,EAAE,IAAU;QAChI,IAAI,GAAG,GAAG,GAAG,IAAI,CAAC,OAAO,EAAE,aAAa,SAAS,YAAY,eAAe,kBAAkB,CAAC;QAC/F,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,EAAE,aAAa,CAAgD,CAAC;IAC9F,CAAC;IACD,MAAM,CAAC,wBAAwB,CAAC,EAAE,SAAS,EAAE,eAAe,EAAE,oBAAoB,EAAkB,EAAE,WAAW,EAAE,IAAI;QACnH,IAAI,GAAG,GAAG,GAAG,IAAI,CAAC,OAAO,EAAE,aAAa,SAAS,YAAY,eAAe,oBAAoB,oBAAoB,EAAE,CAAC;QACvH,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,EAAE,WAAW,CAA8C,CAAC;IACzF,CAAC;IACD,MAAM,CAAC,mBAAmB,CAAC,EAAE,SAAS,EAAE,eAAe,EAAkB,EAAE,MAAM,EAAE,IAAI;QACnF,IAAI,GAAG,GAAG,GAAG,IAAI,CAAC,OAAO,EAAE,aAAa,SAAS,YAAY,eAAe,EAAE,CAAC;QAC/E,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,EAAE,MAAM,CAAyC,CAAC;IAC/E,CAAC;IACD,MAAM,CAAC,mBAAmB,CAAC,EAAE,SAAS,EAAE,eAAe,EAAkB,EAAE,IAAI;QAC3E,IAAI,GAAG,GAAG,GAAG,IAAI,CAAC,OAAO,EAAE,aAAa,SAAS,YAAY,eAAe,EAAE,CAAC;QAC/E,OAAO,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,IAAI,CAA6B,CAAC;IAC9D,CAAC;CACJ;AAED,gBAAgB,CAAC,SAAS,CAAC,CAAC"}
|
|
@@ -1,13 +1,16 @@
|
|
|
1
1
|
import { Matrix4 } from "three";
|
|
2
2
|
import ApiMatrix4 from "./api_matrix_4";
|
|
3
|
-
import { DateLike,
|
|
4
|
-
export
|
|
3
|
+
import { DateLike, ModifyPartial } from "type_aliases";
|
|
4
|
+
export declare type ApiScanDatasetArgument = ModifyPartial<ApiScanDataset, {
|
|
5
5
|
coarseAlignmentMatrix?: ApiMatrix4 | Matrix4 | string | null;
|
|
6
6
|
fineAlignmentMatrix?: ApiMatrix4 | Matrix4 | string | null;
|
|
7
7
|
scanDate?: DateLike;
|
|
8
|
+
qaStarted?: DateLike;
|
|
9
|
+
qaComplete?: DateLike;
|
|
10
|
+
analysisCompleted?: DateLike;
|
|
11
|
+
manualAnalysisSkipped?: DateLike;
|
|
8
12
|
scanDateString?: string;
|
|
9
|
-
}
|
|
10
|
-
}
|
|
13
|
+
}>;
|
|
11
14
|
export declare enum ApiScanDatasetQaState {
|
|
12
15
|
NO_DATA = "NO_DATA",
|
|
13
16
|
NOT_STARTED = "NOT_STARTED",
|
|
@@ -15,7 +18,7 @@ export declare enum ApiScanDatasetQaState {
|
|
|
15
18
|
COMPLETED = "COMPLETED"
|
|
16
19
|
}
|
|
17
20
|
export declare class ApiScanDataset {
|
|
18
|
-
constructor({ id, firebaseId, firebaseFloorId, scanNumber, dataPresences, analysisCompleted,
|
|
21
|
+
constructor({ id, firebaseId, firebaseFloorId, scanNumber, dataPresences, analysisCompleted, manualAnalysisSkipped, notes, name, coarseAlignmentMatrix, fineAlignmentMatrix, scanDate, scanDateString, qaStarted, qaComplete, qaState, }: ApiScanDatasetArgument);
|
|
19
22
|
/**
|
|
20
23
|
* Internal identifier, not used in URLs.
|
|
21
24
|
*/
|
|
@@ -40,8 +43,8 @@ export declare class ApiScanDataset {
|
|
|
40
43
|
* Date that the dataset was captured.
|
|
41
44
|
*/
|
|
42
45
|
scanDateString: string | null;
|
|
43
|
-
analysisCompleted: number | null;
|
|
44
|
-
|
|
46
|
+
readonly analysisCompleted: number | null;
|
|
47
|
+
readonly manualAnalysisSkipped: number | null;
|
|
45
48
|
coarseAlignmentMatrix: ApiMatrix4 | null;
|
|
46
49
|
fineAlignmentMatrix: ApiMatrix4 | null;
|
|
47
50
|
dataPresences?: {
|
|
@@ -49,8 +52,8 @@ export declare class ApiScanDataset {
|
|
|
49
52
|
};
|
|
50
53
|
notes: string | null;
|
|
51
54
|
name: string | null;
|
|
52
|
-
readonly qaStarted:
|
|
53
|
-
readonly qaComplete:
|
|
55
|
+
readonly qaStarted: number | null;
|
|
56
|
+
readonly qaComplete: number | null;
|
|
54
57
|
/**
|
|
55
58
|
* current QA/QC state based on qaStarted/qaComplete, calculated by the
|
|
56
59
|
* gateway so the frontend doesn't need to replicate business logic
|
|
@@ -10,7 +10,7 @@ export var ApiScanDatasetQaState;
|
|
|
10
10
|
ApiScanDatasetQaState["COMPLETED"] = "COMPLETED";
|
|
11
11
|
})(ApiScanDatasetQaState || (ApiScanDatasetQaState = {}));
|
|
12
12
|
export class ApiScanDataset {
|
|
13
|
-
constructor({ id, firebaseId, firebaseFloorId, scanNumber, dataPresences, analysisCompleted,
|
|
13
|
+
constructor({ id, firebaseId, firebaseFloorId, scanNumber, dataPresences, analysisCompleted, manualAnalysisSkipped, notes, name, coarseAlignmentMatrix, fineAlignmentMatrix, scanDate, scanDateString, qaStarted, qaComplete, qaState, }) {
|
|
14
14
|
/**
|
|
15
15
|
* Date that the dataset was captured.
|
|
16
16
|
*/
|
|
@@ -30,7 +30,11 @@ export class ApiScanDataset {
|
|
|
30
30
|
* gateway so the frontend doesn't need to replicate business logic
|
|
31
31
|
*/
|
|
32
32
|
this.qaState = null;
|
|
33
|
-
addInstantGetterAndSetterToApiModel(this, "scanDate");
|
|
33
|
+
addInstantGetterAndSetterToApiModel(this, "scanDate", scanDate);
|
|
34
|
+
addInstantGetterAndSetterToApiModel(this, "qaStarted", qaStarted);
|
|
35
|
+
addInstantGetterAndSetterToApiModel(this, "qaComplete", qaComplete);
|
|
36
|
+
addInstantGetterAndSetterToApiModel(this, "analysisCompleted", analysisCompleted);
|
|
37
|
+
addInstantGetterAndSetterToApiModel(this, "manualAnalysisSkipped", manualAnalysisSkipped);
|
|
34
38
|
addReadOnlyPropertiesToModel(this, { id, firebaseId, firebaseFloorId, scanNumber });
|
|
35
39
|
let coarseAlignmentMatrixVal, fineAlignmentMatrixVal;
|
|
36
40
|
Object.defineProperties(this, {
|
|
@@ -78,13 +82,7 @@ export class ApiScanDataset {
|
|
|
78
82
|
}
|
|
79
83
|
this.notes = notes;
|
|
80
84
|
this.name = name;
|
|
81
|
-
// @ts-ignore
|
|
82
|
-
this.scanDate = scanDate;
|
|
83
85
|
this.scanDateString = scanDateString;
|
|
84
|
-
this.analysisCompleted = analysisCompleted;
|
|
85
|
-
this.manualQcPresent = manualQcPresent;
|
|
86
|
-
this.qaStarted = qaStarted;
|
|
87
|
-
this.qaComplete = qaComplete;
|
|
88
86
|
this.qaState = qaState;
|
|
89
87
|
}
|
|
90
88
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api_scan_dataset.js","sourceRoot":"","sources":["../../../../source/models/api/api_scan_dataset.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAChC,OAAO,mCAAmC,MAAM,yDAAyD,CAAC;AAC1G,OAAO,4BAA4B,MAAM,gDAAgD,CAAC;AAE1F,OAAO,gBAAgB,MAAM,qCAAqC,CAAC;
|
|
1
|
+
{"version":3,"file":"api_scan_dataset.js","sourceRoot":"","sources":["../../../../source/models/api/api_scan_dataset.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/source/api/report_api.ts
CHANGED
|
@@ -9,8 +9,11 @@ export default class ReportApi {
|
|
|
9
9
|
let url = `${Http.baseUrl()}/projects/${projectId}/reports`;
|
|
10
10
|
return Http.post(url, user, report) as unknown as Promise<ApiInspectReport>;
|
|
11
11
|
}
|
|
12
|
-
static listInspectReports({projectId}: AssociationIds, user: User): Promise<ApiInspectReport[]> {
|
|
12
|
+
static listInspectReports({projectId}: AssociationIds, user: User, displayEntries?: boolean): Promise<ApiInspectReport[]> {
|
|
13
13
|
let url = `${Http.baseUrl()}/projects/${projectId}/reports`;
|
|
14
|
+
if (displayEntries) {
|
|
15
|
+
url += "?displayEntries=true";
|
|
16
|
+
}
|
|
14
17
|
return Http.get(url, user) as unknown as Promise<ApiInspectReport[]>;
|
|
15
18
|
}
|
|
16
19
|
static listInspectReportEntries({projectId, inspectReportId}: AssociationIds, user: User): Promise<ApiInspectReportEntry[]> {
|
|
@@ -25,6 +28,14 @@ export default class ReportApi {
|
|
|
25
28
|
let url = `${Http.baseUrl()}/projects/${projectId}/reports/${inspectReportId}/inspect-entries/${inspectReportEntryId}`;
|
|
26
29
|
return Http.put(url, user, reportEntry) as unknown as Promise<ApiInspectReportEntry>;
|
|
27
30
|
}
|
|
31
|
+
static updateInspectReport({ projectId, inspectReportId }: AssociationIds, report, user): Promise<ApiInspectReport> {
|
|
32
|
+
let url = `${Http.baseUrl()}/projects/${projectId}/reports/${inspectReportId}`;
|
|
33
|
+
return Http.put(url, user, report) as unknown as Promise<ApiInspectReport>;
|
|
34
|
+
}
|
|
35
|
+
static deleteInspectReport({ projectId, inspectReportId }: AssociationIds, user): Promise<void> {
|
|
36
|
+
let url = `${Http.baseUrl()}/projects/${projectId}/reports/${inspectReportId}`;
|
|
37
|
+
return Http.delete(url, user) as unknown as Promise<void>;
|
|
38
|
+
}
|
|
28
39
|
}
|
|
29
40
|
|
|
30
41
|
makeErrorsPretty(ReportApi);
|
|
@@ -3,14 +3,18 @@ import addInstantGetterAndSetterToApiModel from "../../mixins/add_instant_getter
|
|
|
3
3
|
import addReadOnlyPropertiesToModel from "../../mixins/add_read_only_properties_to_model";
|
|
4
4
|
import ApiMatrix4 from "./api_matrix_4";
|
|
5
5
|
import Matrix4Converter from "../../converters/matrix_4_converter";
|
|
6
|
-
import { DateLike,
|
|
6
|
+
import { DateLike, ModifyPartial } from "type_aliases";
|
|
7
7
|
|
|
8
|
-
export
|
|
8
|
+
export type ApiScanDatasetArgument = ModifyPartial<ApiScanDataset, {
|
|
9
9
|
coarseAlignmentMatrix?: ApiMatrix4 | Matrix4 | string | null
|
|
10
10
|
fineAlignmentMatrix?: ApiMatrix4 | Matrix4 | string | null
|
|
11
11
|
scanDate?: DateLike,
|
|
12
|
+
qaStarted?: DateLike,
|
|
13
|
+
qaComplete?: DateLike,
|
|
14
|
+
analysisCompleted?: DateLike,
|
|
15
|
+
manualAnalysisSkipped?: DateLike,
|
|
12
16
|
scanDateString?: string,
|
|
13
|
-
}
|
|
17
|
+
}>
|
|
14
18
|
|
|
15
19
|
export enum ApiScanDatasetQaState {
|
|
16
20
|
NO_DATA = "NO_DATA",
|
|
@@ -21,24 +25,29 @@ export enum ApiScanDatasetQaState {
|
|
|
21
25
|
|
|
22
26
|
export class ApiScanDataset {
|
|
23
27
|
constructor({
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
28
|
+
id,
|
|
29
|
+
firebaseId,
|
|
30
|
+
firebaseFloorId,
|
|
31
|
+
scanNumber,
|
|
32
|
+
dataPresences,
|
|
33
|
+
analysisCompleted,
|
|
34
|
+
manualAnalysisSkipped,
|
|
35
|
+
notes,
|
|
36
|
+
name,
|
|
37
|
+
coarseAlignmentMatrix,
|
|
38
|
+
fineAlignmentMatrix,
|
|
39
|
+
scanDate,
|
|
40
|
+
scanDateString,
|
|
41
|
+
qaStarted,
|
|
42
|
+
qaComplete,
|
|
43
|
+
qaState,
|
|
44
|
+
}: ApiScanDatasetArgument)
|
|
45
|
+
{
|
|
46
|
+
addInstantGetterAndSetterToApiModel(this, "scanDate", scanDate);
|
|
47
|
+
addInstantGetterAndSetterToApiModel(this, "qaStarted", qaStarted);
|
|
48
|
+
addInstantGetterAndSetterToApiModel(this, "qaComplete", qaComplete);
|
|
49
|
+
addInstantGetterAndSetterToApiModel(this, "analysisCompleted", analysisCompleted);
|
|
50
|
+
addInstantGetterAndSetterToApiModel(this, "manualAnalysisSkipped", manualAnalysisSkipped);
|
|
42
51
|
addReadOnlyPropertiesToModel(this, { id, firebaseId, firebaseFloorId, scanNumber });
|
|
43
52
|
let coarseAlignmentMatrixVal, fineAlignmentMatrixVal;
|
|
44
53
|
Object.defineProperties(this, {
|
|
@@ -82,13 +91,7 @@ export class ApiScanDataset {
|
|
|
82
91
|
}
|
|
83
92
|
this.notes = notes;
|
|
84
93
|
this.name = name;
|
|
85
|
-
// @ts-ignore
|
|
86
|
-
this.scanDate = scanDate;
|
|
87
94
|
this.scanDateString = scanDateString;
|
|
88
|
-
this.analysisCompleted = analysisCompleted;
|
|
89
|
-
this.manualQcPresent = manualQcPresent;
|
|
90
|
-
this.qaStarted = qaStarted;
|
|
91
|
-
this.qaComplete = qaComplete;
|
|
92
95
|
this.qaState = qaState;
|
|
93
96
|
}
|
|
94
97
|
|
|
@@ -121,15 +124,15 @@ export class ApiScanDataset {
|
|
|
121
124
|
*/
|
|
122
125
|
scanDateString: string | null = null;
|
|
123
126
|
|
|
124
|
-
analysisCompleted: number | null;
|
|
125
|
-
|
|
127
|
+
readonly analysisCompleted: number | null;
|
|
128
|
+
readonly manualAnalysisSkipped: number | null;
|
|
126
129
|
coarseAlignmentMatrix: ApiMatrix4 | null = null;
|
|
127
130
|
fineAlignmentMatrix: ApiMatrix4 | null = null;
|
|
128
131
|
dataPresences?: { scanAnalysis?: boolean };
|
|
129
132
|
notes: string | null = null;
|
|
130
133
|
name: string | null = null;
|
|
131
|
-
readonly qaStarted:
|
|
132
|
-
readonly qaComplete:
|
|
134
|
+
readonly qaStarted: number | null = null;
|
|
135
|
+
readonly qaComplete: number | null = null;
|
|
133
136
|
/**
|
|
134
137
|
* current QA/QC state based on qaStarted/qaComplete, calculated by the
|
|
135
138
|
* gateway so the frontend doesn't need to replicate business logic
|