avvir 3.4.5 → 3.4.7

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.
@@ -1229,6 +1229,21 @@ var ReportApi = /** @class */ (function () {
1229
1229
  var url = _utilities_http__WEBPACK_IMPORTED_MODULE_1__["default"].baseUrl() + "/projects/" + projectId + "/reports/" + inspectReportId + "/inspect-entries";
1230
1230
  return _utilities_http__WEBPACK_IMPORTED_MODULE_1__["default"].post(url, user, reportEntries);
1231
1231
  };
1232
+ ReportApi.updateInspectReportEntry = function (_a, reportEntry, user) {
1233
+ var projectId = _a.projectId, inspectReportId = _a.inspectReportId, inspectReportEntryId = _a.inspectReportEntryId;
1234
+ var url = _utilities_http__WEBPACK_IMPORTED_MODULE_1__["default"].baseUrl() + "/projects/" + projectId + "/reports/" + inspectReportId + "/inspect-entries/" + inspectReportEntryId;
1235
+ return _utilities_http__WEBPACK_IMPORTED_MODULE_1__["default"].put(url, user, reportEntry);
1236
+ };
1237
+ ReportApi.updateInspectReport = function (_a, report, user) {
1238
+ var projectId = _a.projectId, inspectReportId = _a.inspectReportId;
1239
+ var url = _utilities_http__WEBPACK_IMPORTED_MODULE_1__["default"].baseUrl() + "/projects/" + projectId + "/reports/" + inspectReportId;
1240
+ return _utilities_http__WEBPACK_IMPORTED_MODULE_1__["default"].put(url, user, report);
1241
+ };
1242
+ ReportApi.deleteInspectReport = function (_a, user) {
1243
+ var projectId = _a.projectId, inspectReportId = _a.inspectReportId;
1244
+ var url = _utilities_http__WEBPACK_IMPORTED_MODULE_1__["default"].baseUrl() + "/projects/" + projectId + "/reports/" + inspectReportId;
1245
+ return _utilities_http__WEBPACK_IMPORTED_MODULE_1__["default"]["delete"](url, user);
1246
+ };
1232
1247
  return ReportApi;
1233
1248
  }());
1234
1249
  /* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = (ReportApi);
@@ -3519,18 +3534,20 @@ __webpack_require__.r(__webpack_exports__);
3519
3534
  /* harmony export */ });
3520
3535
  var ApiInspectReportEntryElement = /** @class */ (function () {
3521
3536
  function ApiInspectReportEntryElement(_a) {
3522
- var masterformatCode = _a.masterformatCode, builtStatus = _a.builtStatus, deviationVectorMeters = _a.deviationVectorMeters, globalId = _a.globalId;
3537
+ var masterformatCode = _a.masterformatCode, builtStatus = _a.builtStatus, deviationVectorMeters = _a.deviationVectorMeters, globalId = _a.globalId, name = _a.name;
3523
3538
  this.masterformatCode = masterformatCode;
3524
3539
  this.builtStatus = builtStatus;
3525
3540
  this.deviationVectorMeters = deviationVectorMeters;
3526
3541
  this.globalId = globalId;
3542
+ this.name = name;
3527
3543
  }
3528
3544
  ApiInspectReportEntryElement.plannedBuildingElementToApiInspectReportEntry = function (element, level1Masterformat) {
3529
3545
  return new ApiInspectReportEntryElement({
3530
3546
  masterformatCode: level1Masterformat,
3531
3547
  globalId: element.globalId,
3532
3548
  deviationVectorMeters: element.deviationVectorMeters,
3533
- builtStatus: element.builtStatus
3549
+ builtStatus: element.builtStatus,
3550
+ name: element.name
3534
3551
  });
3535
3552
  };
3536
3553
  return ApiInspectReportEntryElement;
@@ -4823,7 +4840,7 @@ var ApiScanDatasetQaState;
4823
4840
  })(ApiScanDatasetQaState || (ApiScanDatasetQaState = {}));
4824
4841
  var ApiScanDataset = /** @class */ (function () {
4825
4842
  function ApiScanDataset(_a) {
4826
- var id = _a.id, firebaseId = _a.firebaseId, firebaseFloorId = _a.firebaseFloorId, scanNumber = _a.scanNumber, dataPresences = _a.dataPresences, analysisCompleted = _a.analysisCompleted, manualQcPresent = _a.manualQcPresent, 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;
4843
+ 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;
4827
4844
  /**
4828
4845
  * Date that the dataset was captured.
4829
4846
  */
@@ -4843,7 +4860,11 @@ var ApiScanDataset = /** @class */ (function () {
4843
4860
  * gateway so the frontend doesn't need to replicate business logic
4844
4861
  */
4845
4862
  this.qaState = null;
4846
- (0,_mixins_add_instant_getter_and_setter_to_api_model__WEBPACK_IMPORTED_MODULE_1__["default"])(this, "scanDate");
4863
+ (0,_mixins_add_instant_getter_and_setter_to_api_model__WEBPACK_IMPORTED_MODULE_1__["default"])(this, "scanDate", scanDate);
4864
+ (0,_mixins_add_instant_getter_and_setter_to_api_model__WEBPACK_IMPORTED_MODULE_1__["default"])(this, "qaStarted", qaStarted);
4865
+ (0,_mixins_add_instant_getter_and_setter_to_api_model__WEBPACK_IMPORTED_MODULE_1__["default"])(this, "qaComplete", qaComplete);
4866
+ (0,_mixins_add_instant_getter_and_setter_to_api_model__WEBPACK_IMPORTED_MODULE_1__["default"])(this, "analysisCompleted", analysisCompleted);
4867
+ (0,_mixins_add_instant_getter_and_setter_to_api_model__WEBPACK_IMPORTED_MODULE_1__["default"])(this, "manualAnalysisSkipped", manualAnalysisSkipped);
4847
4868
  (0,_mixins_add_read_only_properties_to_model__WEBPACK_IMPORTED_MODULE_3__["default"])(this, { id: id, firebaseId: firebaseId, firebaseFloorId: firebaseFloorId, scanNumber: scanNumber });
4848
4869
  var coarseAlignmentMatrixVal, fineAlignmentMatrixVal;
4849
4870
  Object.defineProperties(this, {
@@ -4891,13 +4912,7 @@ var ApiScanDataset = /** @class */ (function () {
4891
4912
  }
4892
4913
  this.notes = notes;
4893
4914
  this.name = name;
4894
- // @ts-ignore
4895
- this.scanDate = scanDate;
4896
4915
  this.scanDateString = scanDateString;
4897
- this.analysisCompleted = analysisCompleted;
4898
- this.manualQcPresent = manualQcPresent;
4899
- this.qaStarted = qaStarted;
4900
- this.qaComplete = qaComplete;
4901
4916
  this.qaState = qaState;
4902
4917
  }
4903
4918
  return ApiScanDataset;
@@ -6,4 +6,7 @@ export default class ReportApi {
6
6
  static listInspectReports({ projectId }: AssociationIds, user: User): 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
+ 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>;
9
12
  }
@@ -17,6 +17,18 @@ export default class ReportApi {
17
17
  let url = `${Http.baseUrl()}/projects/${projectId}/reports/${inspectReportId}/inspect-entries`;
18
18
  return Http.post(url, user, reportEntries);
19
19
  }
20
+ static updateInspectReportEntry({ projectId, inspectReportId, inspectReportEntryId }, reportEntry, user) {
21
+ let url = `${Http.baseUrl()}/projects/${projectId}/reports/${inspectReportId}/inspect-entries/${inspectReportEntryId}`;
22
+ return Http.put(url, user, reportEntry);
23
+ }
24
+ static updateInspectReport({ projectId, inspectReportId }, report, user) {
25
+ let url = `${Http.baseUrl()}/projects/${projectId}/reports/${inspectReportId}`;
26
+ return Http.put(url, user, report);
27
+ }
28
+ static deleteInspectReport({ projectId, inspectReportId }, user) {
29
+ let url = `${Http.baseUrl()}/projects/${projectId}/reports/${inspectReportId}`;
30
+ return Http.delete(url, user);
31
+ }
20
32
  }
21
33
  makeErrorsPretty(ReportApi);
22
34
  //# 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;QAC7D,IAAI,GAAG,GAAG,GAAG,IAAI,CAAC,OAAO,EAAE,aAAa,SAAS,UAAU,CAAC;QAC5D,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;CACJ;AAED,gBAAgB,CAAC,SAAS,CAAC,CAAC"}
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;QAC7D,IAAI,GAAG,GAAG,GAAG,IAAI,CAAC,OAAO,EAAE,aAAa,SAAS,UAAU,CAAC;QAC5D,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,5 +1,4 @@
1
1
  import { ApiInspectReportEntry } from "./api_inspect_report_entry";
2
- import { DateLike } from "type_aliases";
3
2
  import ApiUser from "./api_user";
4
3
  export declare class ApiInspectReport {
5
4
  constructor({ id, firebaseProjectId, name, entries, createdBy, createdAt }: Partial<ApiInspectReport>);
@@ -7,6 +6,6 @@ export declare class ApiInspectReport {
7
6
  readonly firebaseProjectId: string;
8
7
  name: string;
9
8
  entries: ApiInspectReportEntry[];
10
- createdAt?: DateLike;
9
+ createdAt?: number;
11
10
  createdBy?: ApiUser;
12
11
  }
@@ -1 +1 @@
1
- {"version":3,"file":"api_inspect_report.js","sourceRoot":"","sources":["../../../../source/models/api/api_inspect_report.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,mCAAmC,EAAE,4BAA4B,EAAC,MAAM,cAAc,CAAC;AAK/F,MAAM,OAAO,gBAAgB;IACzB,YAAY,EAAE,EAAE,EAAE,iBAAiB,EAAE,IAAI,EAAE,OAAO,EAAE,SAAS,EAAE,SAAS,EAA6B;QACjG,4BAA4B,CAAC,IAAI,EAAE,EAAE,EAAE,EAAE,iBAAiB,EAAE,SAAS,EAAE,CAAC,CAAC;QACzE,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,OAAO,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;QACxC,mCAAmC,CAAC,IAAI,EAAE,WAAW,EAAE,SAAS,CAAC,CAAC;IACtE,CAAC;CAOJ"}
1
+ {"version":3,"file":"api_inspect_report.js","sourceRoot":"","sources":["../../../../source/models/api/api_inspect_report.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,mCAAmC,EAAE,4BAA4B,EAAC,MAAM,cAAc,CAAC;AAI/F,MAAM,OAAO,gBAAgB;IACzB,YAAY,EAAE,EAAE,EAAE,iBAAiB,EAAE,IAAI,EAAE,OAAO,EAAE,SAAS,EAAE,SAAS,EAA6B;QACjG,4BAA4B,CAAC,IAAI,EAAE,EAAE,EAAE,EAAE,iBAAiB,EAAE,SAAS,EAAE,CAAC,CAAC;QACzE,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,OAAO,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;QACxC,mCAAmC,CAAC,IAAI,EAAE,WAAW,EAAE,SAAS,CAAC,CAAC;IACtE,CAAC;CAOJ"}
@@ -1,4 +1,3 @@
1
- import { DateLike } from "type_aliases";
2
1
  import ApiUser from "./api_user";
3
2
  import ApiCloudFile from "./api_cloud_file";
4
3
  import ApiView from "./api_view";
@@ -11,6 +10,6 @@ export declare class ApiInspectReportEntry {
11
10
  view: ApiView;
12
11
  screenshot: ApiCloudFile;
13
12
  elements: ApiInspectReportEntryElement[];
14
- createdAt?: DateLike;
13
+ createdAt?: number;
15
14
  createdBy?: ApiUser;
16
15
  }
@@ -1 +1 @@
1
- {"version":3,"file":"api_inspect_report_entry.js","sourceRoot":"","sources":["../../../../source/models/api/api_inspect_report_entry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,mCAAmC,EAAE,4BAA4B,EAAC,MAAM,cAAc,CAAC;AAS/F,MAAM,OAAO,qBAAqB;IAC9B,YAAY,EAAE,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,UAAU,EAAC,QAAQ,EAAE,SAAS,EAAE,SAAS,EAAkC;QAC/G,4BAA4B,CAAC,IAAI,EAAE,EAAE,EAAE,EAAE,QAAQ,EAAE,SAAS,EAAE,CAAC,CAAC;QAChE,mCAAmC,CAAC,IAAI,EAAE,WAAW,EAAE,SAAS,CAAC,CAAC;QAClE,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC7B,CAAC;CASJ"}
1
+ {"version":3,"file":"api_inspect_report_entry.js","sourceRoot":"","sources":["../../../../source/models/api/api_inspect_report_entry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,mCAAmC,EAAE,4BAA4B,EAAC,MAAM,cAAc,CAAC;AAM/F,MAAM,OAAO,qBAAqB;IAC9B,YAAY,EAAE,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,UAAU,EAAC,QAAQ,EAAE,SAAS,EAAE,SAAS,EAAkC;QAC/G,4BAA4B,CAAC,IAAI,EAAE,EAAE,EAAE,EAAE,QAAQ,EAAE,SAAS,EAAE,CAAC,CAAC;QAChE,mCAAmC,CAAC,IAAI,EAAE,WAAW,EAAE,SAAS,CAAC,CAAC;QAClE,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC7B,CAAC;CASJ"}
@@ -1,14 +1,16 @@
1
1
  import { Vector3 } from "three";
2
2
  export declare class ApiInspectReportEntryElement {
3
- constructor({ masterformatCode, builtStatus, deviationVectorMeters, globalId }: {
3
+ constructor({ masterformatCode, builtStatus, deviationVectorMeters, globalId, name }: {
4
4
  masterformatCode: any;
5
5
  builtStatus: any;
6
6
  deviationVectorMeters: any;
7
7
  globalId: any;
8
+ name: any;
8
9
  });
9
10
  masterformatCode: string;
10
11
  builtStatus: string;
11
12
  deviationVectorMeters: Vector3;
12
13
  globalId: string;
14
+ name: string;
13
15
  static plannedBuildingElementToApiInspectReportEntry(element: any, level1Masterformat: any): ApiInspectReportEntryElement;
14
16
  }
@@ -1,16 +1,18 @@
1
1
  export class ApiInspectReportEntryElement {
2
- constructor({ masterformatCode, builtStatus, deviationVectorMeters, globalId }) {
2
+ constructor({ masterformatCode, builtStatus, deviationVectorMeters, globalId, name }) {
3
3
  this.masterformatCode = masterformatCode;
4
4
  this.builtStatus = builtStatus;
5
5
  this.deviationVectorMeters = deviationVectorMeters;
6
6
  this.globalId = globalId;
7
+ this.name = name;
7
8
  }
8
9
  static plannedBuildingElementToApiInspectReportEntry(element, level1Masterformat) {
9
10
  return new ApiInspectReportEntryElement({
10
11
  masterformatCode: level1Masterformat,
11
12
  globalId: element.globalId,
12
13
  deviationVectorMeters: element.deviationVectorMeters,
13
- builtStatus: element.builtStatus
14
+ builtStatus: element.builtStatus,
15
+ name: element.name
14
16
  });
15
17
  }
16
18
  }
@@ -1 +1 @@
1
- {"version":3,"file":"api_inspect_report_entry_element.js","sourceRoot":"","sources":["../../../../source/models/api/api_inspect_report_entry_element.ts"],"names":[],"mappings":"AAEA,MAAM,OAAO,4BAA4B;IACrC,YAAY,EAAC,gBAAgB,EAAE,WAAW,EAAE,qBAAqB,EAAE,QAAQ,EAAC;QACxE,IAAI,CAAC,gBAAgB,GAAG,gBAAgB,CAAC;QACzC,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAC/B,IAAI,CAAC,qBAAqB,GAAG,qBAAqB,CAAA;QAClD,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC7B,CAAC;IAMD,MAAM,CAAC,6CAA6C,CAAC,OAAO,EAAE,kBAAkB;QAC5E,OAAO,IAAI,4BAA4B,CAAC;YACpC,gBAAgB,EAAE,kBAAkB;YACpC,QAAQ,EAAE,OAAO,CAAC,QAAQ;YAC1B,qBAAqB,EAAE,OAAO,CAAC,qBAAqB;YACpD,WAAW,EAAE,OAAO,CAAC,WAAW;SACnC,CAAC,CAAA;IACN,CAAC;CACJ"}
1
+ {"version":3,"file":"api_inspect_report_entry_element.js","sourceRoot":"","sources":["../../../../source/models/api/api_inspect_report_entry_element.ts"],"names":[],"mappings":"AAEA,MAAM,OAAO,4BAA4B;IACrC,YAAY,EAAC,gBAAgB,EAAE,WAAW,EAAE,qBAAqB,EAAE,QAAQ,EAAE,IAAI,EAAC;QAC9E,IAAI,CAAC,gBAAgB,GAAG,gBAAgB,CAAC;QACzC,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAC/B,IAAI,CAAC,qBAAqB,GAAG,qBAAqB,CAAA;QAClD,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACrB,CAAC;IAOD,MAAM,CAAC,6CAA6C,CAAC,OAAO,EAAE,kBAAkB;QAC5E,OAAO,IAAI,4BAA4B,CAAC;YACpC,gBAAgB,EAAE,kBAAkB;YACpC,QAAQ,EAAE,OAAO,CAAC,QAAQ;YAC1B,qBAAqB,EAAE,OAAO,CAAC,qBAAqB;YACpD,WAAW,EAAE,OAAO,CAAC,WAAW;YAChC,IAAI,EAAE,OAAO,CAAC,IAAI;SACrB,CAAC,CAAA;IACN,CAAC;CACJ"}
@@ -1,13 +1,16 @@
1
1
  import { Matrix4 } from "three";
2
2
  import ApiMatrix4 from "./api_matrix_4";
3
- import { DateLike, Modify } from "./type_aliases";
4
- export interface ApiScanDatasetArgument extends Partial<Modify<ApiScanDataset, {
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, manualQcPresent, notes, name, coarseAlignmentMatrix, fineAlignmentMatrix, scanDate, scanDateString, qaStarted, qaComplete, qaState, }: ApiScanDatasetArgument);
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
- manualQcPresent: number | null;
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: Date | null;
53
- readonly qaComplete: Date | null;
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, manualQcPresent, notes, name, coarseAlignmentMatrix, fineAlignmentMatrix, scanDate, scanDateString, qaStarted, qaComplete, qaState, }) {
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":"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"}
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
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "avvir",
3
3
  "repository": "git@github.com:Avvir/avvir-javascript-client.git",
4
- "version": "3.4.5",
4
+ "version": "3.4.7",
5
5
  "description": "Javascript client for Avvir APIs",
6
6
  "license": "Apache-2.0",
7
7
  "module": "dist/esm/index.js",
@@ -21,6 +21,18 @@ export default class ReportApi {
21
21
  let url = `${Http.baseUrl()}/projects/${projectId}/reports/${inspectReportId}/inspect-entries`;
22
22
  return Http.post(url, user, reportEntries) as unknown as Promise<ApiInspectReportEntry[]>;
23
23
  }
24
+ static updateInspectReportEntry({ projectId, inspectReportId, inspectReportEntryId }: AssociationIds, reportEntry, user): Promise<ApiInspectReportEntry> {
25
+ let url = `${Http.baseUrl()}/projects/${projectId}/reports/${inspectReportId}/inspect-entries/${inspectReportEntryId}`;
26
+ return Http.put(url, user, reportEntry) as unknown as Promise<ApiInspectReportEntry>;
27
+ }
28
+ static updateInspectReport({ projectId, inspectReportId }: AssociationIds, report, user): Promise<ApiInspectReport> {
29
+ let url = `${Http.baseUrl()}/projects/${projectId}/reports/${inspectReportId}`;
30
+ return Http.put(url, user, report) as unknown as Promise<ApiInspectReport>;
31
+ }
32
+ static deleteInspectReport({ projectId, inspectReportId }: AssociationIds, user): Promise<void> {
33
+ let url = `${Http.baseUrl()}/projects/${projectId}/reports/${inspectReportId}`;
34
+ return Http.delete(url, user) as unknown as Promise<void>;
35
+ }
24
36
  }
25
37
 
26
38
  makeErrorsPretty(ReportApi);
@@ -1,6 +1,5 @@
1
1
  import {addInstantGetterAndSetterToApiModel, addReadOnlyPropertiesToModel} from "../../mixins";
2
2
  import {ApiInspectReportEntry} from "./api_inspect_report_entry";
3
- import {DateLike} from "type_aliases";
4
3
  import ApiUser from "./api_user";
5
4
 
6
5
  export class ApiInspectReport {
@@ -14,6 +13,6 @@ export class ApiInspectReport {
14
13
  readonly firebaseProjectId: string;
15
14
  name: string;
16
15
  entries: ApiInspectReportEntry[];
17
- createdAt?: DateLike;
16
+ createdAt?: number;
18
17
  createdBy?: ApiUser;
19
18
  }
@@ -1,10 +1,7 @@
1
1
  import {addInstantGetterAndSetterToApiModel, addReadOnlyPropertiesToModel} from "../../mixins";
2
- import {DateLike} from "type_aliases";
3
- import ApiPlannedElement from "./api_planned_element";
4
2
  import ApiUser from "./api_user";
5
3
  import ApiCloudFile from "./api_cloud_file";
6
4
  import ApiView from "./api_view";
7
- import {Vector3} from "three";
8
5
  import {ApiInspectReportEntryElement} from "./api_inspect_report_entry_element";
9
6
 
10
7
  export class ApiInspectReportEntry {
@@ -22,6 +19,6 @@ export class ApiInspectReportEntry {
22
19
  view: ApiView;
23
20
  screenshot: ApiCloudFile;
24
21
  elements: ApiInspectReportEntryElement[]
25
- createdAt?: DateLike;
22
+ createdAt?: number;
26
23
  createdBy?: ApiUser;
27
24
  }
@@ -1,23 +1,26 @@
1
1
  import {Vector3} from "three";
2
2
 
3
3
  export class ApiInspectReportEntryElement {
4
- constructor({masterformatCode, builtStatus, deviationVectorMeters, globalId}) {
4
+ constructor({masterformatCode, builtStatus, deviationVectorMeters, globalId, name}) {
5
5
  this.masterformatCode = masterformatCode;
6
6
  this.builtStatus = builtStatus;
7
7
  this.deviationVectorMeters = deviationVectorMeters
8
8
  this.globalId = globalId;
9
+ this.name = name;
9
10
  }
10
11
  masterformatCode: string;
11
12
  builtStatus: string;
12
13
  deviationVectorMeters: Vector3;
13
14
  globalId: string;
15
+ name: string;
14
16
 
15
17
  static plannedBuildingElementToApiInspectReportEntry(element, level1Masterformat): ApiInspectReportEntryElement {
16
18
  return new ApiInspectReportEntryElement({
17
19
  masterformatCode: level1Masterformat,
18
20
  globalId: element.globalId,
19
21
  deviationVectorMeters: element.deviationVectorMeters,
20
- builtStatus: element.builtStatus
22
+ builtStatus: element.builtStatus,
23
+ name: element.name
21
24
  })
22
25
  }
23
26
  }
@@ -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, Modify } from "./type_aliases";
6
+ import { DateLike, ModifyPartial } from "type_aliases";
7
7
 
8
- export interface ApiScanDatasetArgument extends Partial<Modify<ApiScanDataset, {
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
- id,
25
- firebaseId,
26
- firebaseFloorId,
27
- scanNumber,
28
- dataPresences,
29
- analysisCompleted,
30
- manualQcPresent,
31
- notes,
32
- name,
33
- coarseAlignmentMatrix,
34
- fineAlignmentMatrix,
35
- scanDate,
36
- scanDateString,
37
- qaStarted,
38
- qaComplete,
39
- qaState,
40
- }: ApiScanDatasetArgument) {
41
- addInstantGetterAndSetterToApiModel(this, "scanDate");
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
- manualQcPresent: number | null;
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: Date | null = null;
132
- readonly qaComplete: Date | null = null;
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