-
-## Policy Guide
-
-This policy is published to Hedera network and can either be imported via Github(.policy file) or IPFS timestamp.
-
-
-
-
-### Available Roles
-
- - Project Proponent - Project developer who proposes and executes cookstove project and receives credits(VER)
- - VVB(Validation & Verification Body) - Independent third party who audits project's critical documentation and monitoring reports
- - Gold Standard(GS) - GS is the trusted registry overseeing the entire project cycle and issuing the credits(VER)
-
-### Important Documents & Schemas
-
- 1. Registry Account Application(RAA) - Account applications to become a project proponent, VVB with registry
- 2. Project Inception Document (PID) - Preliminary design of project highlighting eligibility, additionality and methodology criteria along with stakeholder consultation report
- 3. Project Design Document (PDD) - Submitted after PID is approved, detailed report on project execution, emissions calculations and sustainable development goals.
- 4. Monitoring Report (MR) - Monitoring report contains analysis on cookstove usages on the sample group and estimates carbon avoided/reduced
- 5. VER Credit Request(VCR) - Requesting specified number of credits into Hedera account
- 6. Measuring Device - Registering a stove usage IOT device alongside the cookstove for automatic MRs
- 7. VER Auto Credit Request(VACR) - Requesting automated issuance of credits based on data sent by a measuring device
-
-### Token(Carbon credit)
- Verified Emission Reduction(VER) equivalent to 1 ton of CO2 offset
-
-### Step By Step
-
-#### Registry(Gold Standard) Flow
-
-Registry is allowed to publish and edit policy config, schemas, tokens and all the workflow logic associated with it. They are responsible for approving projects, project proponents, VVBs, and credit issue requests.
-
-1. Login into the service using registry credentials
-
- 
-
-2. Feel free to play around with policy config by clicking on edit icon and understanding the differnt schemas used by policy
-
- 
-
- 
-
- 
-
-3. Registry can review account applications by clicking manage accounts
-
- 
-
-4. Registry can review project inception documents allowing the listing of projects on standard website and trigger project execution on ground.
-
- 
-
-5. Once PDD and MR are approved by VVB, project proponents can submit credit issue requests(VER) which registries have to take decisions on.
-
- 
-
-6. Once VER issue request is approved, an end-to-end trust chain can be viewed by administrator. Since everything is happening transparently on public ledger(Hedera), anyone can trace the source of credits and each step that happened in the process.
-
- 
-
-
-#### Project Proponent Flow
-
-1. Complete the sign up form(RAA) to become a project proponent
-
- 
-
- 
-
-2. Wait till the application is approved by the registry admin. Once approved, proponents will be able to submit project inception documents. This includes stakeholder consultation report as well.
-
- 
-
- 
-
-3. Once project is approved by registry, a detailed PDD(project design document) needs to be submitted. This is the most important document highlighting the technical details of project. It includes calculations around baseline, project and leakage scenarios for accurate calculation of avoided emissions.
-
- 
-
- 
-
-4. After PDD approval, project proponent will execute the project on ground and submit regular monitoring reports(MR)
-
- 
-
-5. Once a monitoring report is approved by VVB, project proponent can request corresponding carbon credits(VER in this case) to be credited in their account. It would need a VC document ID for both monitoring report and it's approved review by VVB.
-
- 
-
- 
-
-6. Once registry reviews and approves the credit request, they'll be credited into the hedera account provided by project proponent. This is represented by successful minted status.
-
- 
-
-
-#### VVB Flow
-
-VVB is the external independent third party responsible for reviewing Project Design Documents and Monitoring reports submitted by proponents. They can comment and reject/request changes as well.
-
-1. After logging in as VVB, they can view review requests related to project documents. First step is to review PDDs submitted by project proponents.
-
- 
-
- 
-
- 
-
-2. After PDD approval, proponents will be able to send monitoring reports for review. Once approved, project proponents will be able to claim corresponding VERs.
-
- 
-
-
-## Futureproofing(Automated credit issuance)
-
-This workflow includes a bonus flow which is a major distinction from other existing policies. Building monitoring reports for cookstove projects is a very manual and error-prone process due to distributed nature of project. Often, a sample group of households are selected to be monitored and results are extrapolated for all the households(in thousands) leading to overcrediting. Since this methodology focuses on having direct measurement devices associated with a stove, an automated way of monitoring is possible.
-
-
-
-1. Project proponent can register a measuring device associated a given cookstove
-
- 
-
-2. Device can be approved/rejected by the VVB
-
- 
-
-3. Once approved, project developer can raise on-demand credit issuance associated with approved devices. These requests would contain stove fuel usage and temperature data collected automatically by the device
-
- 
-
- 
-
-4. After an approval from VVB for the automated monitoring report, VER mint will be initiated in owner account. This will help in faster crediting cycles along with a transparent process for tracking all the intermediate steps. It'll be a huge boost to scaling up the supply of credits in VCM(Voluntary carbon markets).
-
-## Existing Cookstove Policy Comparison
-
-Latest version of Guardian provides a policy for [improved cookstoves](https://docs.hedera.com/guardian/guardian/demo-guide/carbon-offsets/improved-cookstove). This new Guardian policy builds on top of it to make it more robust, aligned and future-proof.
-
-| **Features** | **ME&ED** | **Improved Cookstove** |
-|--------------------------------------------------------------------------------------------------------------------------------------------------------------------|--------------------------|------------------------|
-| Follows VCM industry project cycle and terminologies(Verra, Gold Standard) | Yes(GS) | No |
-| Substantial overcrediting possible | No | Yes |
-| Critical metrics tracked directly in VC document - Additionality criteria \| Baseline emissions calculation \| Project emissions calculation \| Leakage emissions | Yes \| Yes \| Yes \| Yes | No \| No \| No \| No |
-| IOT based monitoring & automated credit issuance | Yes | No |
-| Scalable according to future credits demand | Yes | No |
-| Exhaustive documentation | Yes | No(incomplete) |
diff --git a/Methodology Library/Verra/Verra Redd/VM0003/README.md b/Methodology Library/Verra/Verra Redd/VM0003/README.md
index 4a5d455175..107956d379 100644
--- a/Methodology Library/Verra/Verra Redd/VM0003/README.md
+++ b/Methodology Library/Verra/Verra Redd/VM0003/README.md
@@ -13,7 +13,6 @@ Verra VM0003 is a carbon offset methodology titled "Improved Forest Management (
-
1. **Project Proponent Submission**: The project proponent begins by submitting the Project Design (PD) to Verra. This document includes ex-ante estimates of monitoring parameters and detailed project information demonstrating compliance with VCS program requirements specific to VM0003.
2. **Verra's Initial Review**: Verra reviews the submitted Project Design and adds the project to the Project Pipeline.
3. **Validation by VVB**: A Validation and Verification Body (VVB) assesses the PD, focusing on the alignment with VCS requirements, and provides a Validation Report.
@@ -24,6 +23,10 @@ Verra VM0003 is a carbon offset methodology titled "Improved Forest Management (
8. **Continuous Monitoring**: Continuously monitor the project's impact according to the established methodology and guidelines, updating the project documentation and reporting to Verra as required.
9. **Ongoing Validation and Verification**: Engage with a VVB for periodic validation and verification as per Verra’s requirements and the project's monitoring plan to ensure ongoing compliance and to validate the emission reductions achieved over time.
+## Demo Video
+
+[Demonstration Video (YouTube Link)](https://youtu.be/-BjsMIABkVs)
+
## Policy Guide
This policy can be imported via Github (.policy file) or IPFS timestamp.
diff --git a/Methodology Library/Verra/Work In Progress/VM0033/VM0033.policy b/Methodology Library/Verra/Work In Progress/VM0033/VM0033.policy
index 66ac14fbca..3002b6a9f1 100644
Binary files a/Methodology Library/Verra/Work In Progress/VM0033/VM0033.policy and b/Methodology Library/Verra/Work In Progress/VM0033/VM0033.policy differ
diff --git a/Methodology Library/Verra/Work In Progress/VM0033/VM0033_policy_schemas_1728474580421.xlsx b/Methodology Library/Verra/Work In Progress/VM0033/policy_1729228338183.xlsx
similarity index 92%
rename from Methodology Library/Verra/Work In Progress/VM0033/VM0033_policy_schemas_1728474580421.xlsx
rename to Methodology Library/Verra/Work In Progress/VM0033/policy_1729228338183.xlsx
index e47a401e34..bf8296063a 100644
Binary files a/Methodology Library/Verra/Work In Progress/VM0033/VM0033_policy_schemas_1728474580421.xlsx and b/Methodology Library/Verra/Work In Progress/VM0033/policy_1729228338183.xlsx differ
diff --git a/Methodology Library/Verra/Work In Progress/VM0033/readme.md b/Methodology Library/Verra/Work In Progress/VM0033/readme.md
index 55f81b2535..958750ffd1 100644
--- a/Methodology Library/Verra/Work In Progress/VM0033/readme.md
+++ b/Methodology Library/Verra/Work In Progress/VM0033/readme.md
@@ -59,13 +59,12 @@ VM0033 on Guardian platform is set to become a powerful tool for scaling up tida
## Policy Workflow
-Coming Soon
## Policy Guide
First version of this policy is published to the Hedera network and can be imported via Github (.policy file) or IPFS timestamp.
-IPFS Timestamp of 0.0.1 - 1728312926.986578213
+IPSF Timestamp of 0.0.2 - 1729153016.931600601
### Available Roles
@@ -111,4 +110,4 @@ Verified Carbon Units (VCUs), each equivalent to one tonne of CO2 equivalent emi
10. The issued VCUs are recorded on the Hedera ledger, ensuring transparency and traceability.
-[TODO: Detailed steps with screenshots to be added]
+[TODO: Detailed steps with screenshots to be added]
\ No newline at end of file
diff --git a/Methodology Library/readme.md b/Methodology Library/readme.md
index e30ca0ca71..772cde4f36 100644
--- a/Methodology Library/readme.md
+++ b/Methodology Library/readme.md
@@ -63,9 +63,10 @@ This folder contains sub folders for each Methodology and their authors (with ma
3. GHG Scope II - Atma
4. GHG Scope 3 - Atma
5. GHGP Corporate Standard - Envision
-6. GHGP Product Standard - Avery Dennison (Coming soon)
-7. E-Mission (Coming soon)
-8. EPA CFR 40 p75 - Serapis (Coming soon)
+6. Climate Action Reserve’s U.S. Landfill Protocol Version 6.0 - Envision
+7. GHGP Product Standard - Avery Dennison (Coming soon)
+8. E-Mission (Coming soon)
+9. EPA CFR 40 p75 - Serapis (Coming soon)
### Hackathon Policies (Under Testing)
diff --git a/README.md b/README.md
index b187ffaa87..28c680d92d 100644
--- a/README.md
+++ b/README.md
@@ -138,7 +138,7 @@ To let the Multi-environment transition happen in a transparent way the `GUARDIA
- As a second example: to test the new release change the HEDERA_NET to "testnet". This is the complete configuration:
- Set the name of the Guardian platform to whatever descripting name in the `.env` file
+ Set the name of the Guardian platform to whatever description name in the `.env` file
```shell
GUARDIAN_ENV="testupgrading"
diff --git a/ai-service/.gitignore b/ai-service/.gitignore
index e1597c74f3..82f0c3ac6d 100644
--- a/ai-service/.gitignore
+++ b/ai-service/.gitignore
@@ -1,2 +1 @@
-/faiss-vector/
/data/
diff --git a/ai-service/faiss-vector/faiss.index b/ai-service/faiss-vector/faiss.index
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/api-gateway/src/api/service/contract.ts b/api-gateway/src/api/service/contract.ts
index f5824c87bf..b408e86912 100644
--- a/api-gateway/src/api/service/contract.ts
+++ b/api-gateway/src/api/service/contract.ts
@@ -1,10 +1,10 @@
import { ContractType, Permissions } from '@guardian/interfaces';
import { IAuthUser, PinoLogger } from '@guardian/common';
import { Body, Controller, Delete, Get, HttpCode, HttpStatus, Param, Post, Query, Req, Response } from '@nestjs/common';
-import { ApiInternalServerErrorResponse, ApiOkResponse, ApiCreatedResponse, ApiOperation, ApiExtraModels, ApiTags, ApiBody, ApiQuery, ApiParam, } from '@nestjs/swagger';
-import { ContractConfigDTO, ContractDTO, RetirePoolDTO, RetirePoolTokenDTO, RetireRequestDTO, RetireRequestTokenDTO, WiperRequestDTO, InternalServerErrorDTO, pageHeader } from '#middlewares';
-import { AuthUser, Auth } from '#auth';
-import { Guardians, UseCache, InternalException, EntityOwner, CacheService, getCacheKey } from '#helpers';
+import { ApiBody, ApiCreatedResponse, ApiExtraModels, ApiInternalServerErrorResponse, ApiOkResponse, ApiOperation, ApiParam, ApiQuery, ApiTags, } from '@nestjs/swagger';
+import { ContractConfigDTO, ContractDTO, InternalServerErrorDTO, pageHeader, RetirePoolDTO, RetirePoolTokenDTO, RetireRequestDTO, RetireRequestTokenDTO, TransactionDTO, WiperRequestDTO } from '#middlewares';
+import { Auth, AuthUser } from '#auth';
+import { CacheService, EntityOwner, getCacheKey, Guardians, InternalException, UseCache } from '#helpers';
/**
* Contracts api
@@ -179,6 +179,52 @@ export class ContractsApi {
}
}
+ /**
+ * Return all transactions for schema
+ * @param user
+ * @param contractId
+ */
+ @Get('/:contractId/transactions')
+ @Auth(
+ Permissions.CONTRACTS_CONTRACT_READ,
+ // UserRole.STANDARD_REGISTRY,
+ // UserRole.AUDITOR ?,
+ // UserRole.USER ?
+ )
+ @ApiOperation({
+ summary: 'Return all transactions for contract.',
+ description: 'Return all transactions for contract.',
+ })
+ @ApiParam({
+ name: 'contractId',
+ type: String,
+ description: 'Contract identifier',
+ required: true
+ })
+ @ApiOkResponse({
+ description: 'Successful operation.',
+ isArray: true,
+ type: TransactionDTO
+ })
+ @ApiInternalServerErrorResponse({
+ description: 'Internal server error.',
+ type: InternalServerErrorDTO
+ })
+ @ApiExtraModels(TransactionDTO, InternalServerErrorDTO)
+ @HttpCode(HttpStatus.OK)
+ async getSchemaTransactions(
+ @AuthUser() user: IAuthUser,
+ @Param('contractId') contractId: string,
+ ): Promise.png)
.png)
.png)
.png)
.png)
.png)
.png)
.png)
.png)
.png)
.png)
.png)
.png)
.png)
.png)
.png)
.png)
.png)
.png)
.png)
.png)
.png)
.png)
.png)
.png)
.png)
.png)
.png)
.png)
.png)
.png)
.png)
.png)
.png)
.png)
.png)
.png)
 (1) (1) (1) (1) (1) (1) (1) (1) (1) (1) (1) (1) (1) (1) (1) (1) (1) (1) (1) (1).png)
.png)
.png)
.png)
.png)
.png)
.png)
.png)
.png)
.png)
.png)
.png)
.png)
.png)
.png)
 (1) (1) (1) (1) (1) (1) (1) (1) (1) (1) (1) (1) (1) (1) (1) (1) (1) (1) (1) (1) (1) (1) (1).png)
.png)
 (1) (1) (1) (1) (1) (1) (1) (1) (1) (1) (1) (1) (1) (1) (1) (1) (1) (1) (1) (1) (1) (1) (1) (1).png)
.png)
 (1) (1) (1) (1) (1) (1) (1) (1) (1) (1) (1) (1) (1) (1) (1) (1) (1) (1) (1) (1) (1) (1).png)
 (1) (1) (1) (1) (1) (1) (1) (1) (1) (1) (1) (1) (1) (1) (1) (1) (1) (1) (1) (1) (1).png)
 (1) (1) (1) (1) (1) (1) (1) (1) (1) (1) (1) (1) (1) (1) (1) (1) (1).png)
 (1) (1) (1) (1) (1) (1) (1) (1) (1) (1) (1) (1) (1) (1) (1) (1).png)
 (1) (1) (1) (1) (1) (1) (1) (1) (1) (1) (1) (1) (1).png)
.png)
 (1) (1) (1) (1) (1) (1) (1) (1) (1) (1) (1) (1) (1).png)
 (1) (1) (1) (1) (1) (1) (1) (1) (1) (1) (1) (1) (1).png)
.png)
.png)
.png)
.png)
.png)
.png)
.png)
.png)
.png)
.png)
.png)
.png)
.png)
.png)
.png)
.png)
.png)
.png)
.png)
.png)
.png)
.png)
.png)
.png)
.png)
.png)
.png)
.png)
.png)
.png)
.png)
.png)
.png)
.png)
.png)
.png)
.png)
.png)
.png)
.png)
.png)
.png)
.png)
.png)
.png)
.png)
.png)
.png)
.png)
.png)
.png)
.png)
.png)
.png)
.png)
.png)
 (1).png)
 (1) (1) (1).png)
 (1) (1) (1) (1).png)
.png)
-
- (1).png)
 (1) (1) (1) (1) (1).png)
 (1) (1) (1) (1) (1) (1).png)
.png)
.png)
.png)
.png)
.png)
.png)
.png)
.png)
.png)
- {{content}}:
+ {{content}}
-
-
- {{item.name}}
-
+
diff --git a/frontend/src/app/modules/policy-engine/policy-viewer/blocks/filters-addon-block/filters-addon-block.component.scss b/frontend/src/app/modules/policy-engine/policy-viewer/blocks/filters-addon-block/filters-addon-block.component.scss
index 9fb8bf6ede..763708f1d8 100644
--- a/frontend/src/app/modules/policy-engine/policy-viewer/blocks/filters-addon-block/filters-addon-block.component.scss
+++ b/frontend/src/app/modules/policy-engine/policy-viewer/blocks/filters-addon-block/filters-addon-block.component.scss
@@ -24,11 +24,8 @@
}
.content {
- box-shadow: 0px 3px 6px #00000020;
- background: #e5e5e5;
+ background: #f9fafc;
display: inline-block;
- margin: 7px;
- padding: 10px 10px 6px 10px;
}
.content-name {
@@ -37,6 +34,100 @@
}
.content-select {
+ min-width: 265px;
+ display: flex;
+ flex-direction: column;
+ align-self: flex-end;
+ flex: 1;
+ height: 38px;
+}
+
+.grouped-content {
+ display: flex;
+ align-items: flex-start;
+}
+
+.type-select {
+ min-width: 265px;
+ display: flex;
+ flex-direction: column;
+ align-self: flex-end;
+ flex: 1;
+ height: 38px;
+}
+
+p-dropdown,
+p-calendar {
+ height: 40px;
+}
+
+.common-prefix-dropdown {
+ background-color: white;
+ display: block;
+ height: 38px;
+ border: 1px solid #ced4da;
+ padding: 9px 6px 9px 12px;
+ color: #848FA9;
+ font-size: 14px;
+ box-sizing: border-box;
+ border-top-left-radius: 8px;
+ border-bottom-left-radius: 8px;
+ border-right: 0;
+ white-space: nowrap;
+}
+
+.prefix-dropdown {
+ font-size: 14px;
+ color: #848FA9;
display: inline-block;
- width: 190px;
+ margin-right: 5px;
+}
+
+::ng-deep .p-dropdown-label {
+ font-size: 14px;
+ color: #23252E;
+}
+
+::ng-deep .p-component {
+ border-radius: 8px;
+ outline: none;
+ box-shadow: none;
+}
+
+::ng-deep .filter-dropdown .p-dropdown {
+ border-radius: 0 8px 8px 0;
+ border-left: 0;
+}
+
+::ng-deep .calendar-filter .p-inputtext {
+ padding: 8px 8px 11px 16px;
+ border-radius: 0 8px 8px 0;
+ border-left: 0;
+ height: 37px;
+}
+
+::ng-deep .calendar-filter .p-datepicker-trigger {
+ position: absolute;
+ top: 50%;
+ right: 8px;
+ transform: translateY(-50%);
+ pointer-events: none;
+ background-color: white;
+ color: gray;
+ border: none;
+ padding: 0;
+}
+
+.input-filter {
+ background-color: white;
+ display: block;
+ height: 38px;
+ border: 1px solid #ced4da;
+ padding: 9px 6px 9px 12px;
+ font-size: 14px;
+ box-sizing: border-box;
+ border-top-right-radius: 8px;
+ border-bottom-right-radius: 8px;
+ border-left: 0;
+ outline: none;
}
\ No newline at end of file
diff --git a/frontend/src/app/modules/policy-engine/policy-viewer/blocks/filters-addon-block/filters-addon-block.component.ts b/frontend/src/app/modules/policy-engine/policy-viewer/blocks/filters-addon-block/filters-addon-block.component.ts
index 1004912b67..8ad347cb0f 100644
--- a/frontend/src/app/modules/policy-engine/policy-viewer/blocks/filters-addon-block/filters-addon-block.component.ts
+++ b/frontend/src/app/modules/policy-engine/policy-viewer/blocks/filters-addon-block/filters-addon-block.component.ts
@@ -3,6 +3,7 @@ import { PolicyEngineService } from 'src/app/services/policy-engine.service';
import { PolicyHelper } from 'src/app/services/policy-helper.service';
import { WebSocketService } from 'src/app/services/web-socket.service';
import { HttpErrorResponse } from '@angular/common/http';
+import moment from 'moment';
/**
* Component for display block of 'requestVcDocument' type.
@@ -27,6 +28,19 @@ export class FiltersAddonBlockComponent implements OnInit {
target: any;
filters: any;
currentValue: any;
+ currentType: string = 'eq';
+ queryType: string = 'equal';
+
+ userDefinedOptions = [
+ { name: 'Equal', value: 'eq' },
+ { name: 'Not Equal', value: 'ne' },
+ { name: 'In', value: 'in' },
+ { name: 'Not In', value: 'nin' },
+ { name: 'Greater Than', value: 'gt' },
+ { name: 'Greater Than or Equal', value: 'gte' },
+ { name: 'Less Than', value: 'lt' },
+ { name: 'Less Than or Equal', value: 'lte' }
+ ];
constructor(
private policyEngineService: PolicyEngineService,
@@ -84,6 +98,39 @@ export class FiltersAddonBlockComponent implements OnInit {
}
}
+ private parseFilterValue(value: string): [string, string] {
+ if (typeof value === 'string') {
+ if (value.startsWith('eq:')) {
+ return ['eq', value.substring('eq'.length + 1)];
+ }
+ if (value.startsWith('ne:')) {
+ return ['ne', value.substring('ne'.length + 1)];
+ }
+ if (value.startsWith('in:')) {
+ return ['in', value.substring('in'.length + 1)];
+ }
+ if (value.startsWith('nin:')) {
+ return ['nin', value.substring('nin'.length + 1)];
+ }
+ if (value.startsWith('gt:')) {
+ return ['gt', value.substring('gt'.length + 1)];
+ }
+ if (value.startsWith('gte:')) {
+ return ['gte', value.substring('gte'.length + 1)];
+ }
+ if (value.startsWith('lt:')) {
+ return ['lt', value.substring('lt'.length + 1)];
+ }
+ if (value.startsWith('lte:')) {
+ return ['lte', value.substring('lte'.length + 1)];
+ }
+ if (value.startsWith('regex:')) {
+ return ['eq', value.substring('regex'.length + 1)];
+ }
+ }
+ return ['eq', value];
+ }
+
setData(data: any) {
this.currentValue = null;
if (data) {
@@ -92,7 +139,15 @@ export class FiltersAddonBlockComponent implements OnInit {
this.target = data.targetBlock;
this.content = data.uiMetaData.content;
this.filters = data.filters;
- this.currentValue = data.filterValue;
+ this.queryType = data.queryType;
+ if (this.queryType === 'user_defined') {
+ const [type, value] = this.parseFilterValue(data.filterValue);
+ this.currentType = type;
+ this.currentValue = value;
+ } else {
+ this.currentType = this.queryType || 'eq';
+ this.currentValue = data.filterValue;
+ }
if (this.type == 'unelected') {
}
@@ -102,14 +157,17 @@ export class FiltersAddonBlockComponent implements OnInit {
this.options = [];
if (data.canBeEmpty) {
this.options.push({
- name: "",
+ name: "Not selected",
value: null,
});
}
if (options) {
for (let i = 0; i < options.length; i++) {
const item = options[i];
- this.options.push(item);
+ this.options.push({
+ name: item.name,
+ value: String(item.value)
+ })
}
}
}
@@ -118,10 +176,22 @@ export class FiltersAddonBlockComponent implements OnInit {
}
}
- onFilters() {
+ onFilters(event: any) {
+ if(this.type === 'datepicker'){
+ this.currentValue = moment(this.currentValue).format('YYYY-MM-DD');
+ }
+
this.loading = true;
+ const options: any = { filterValue: null };
+ if(this.currentValue) {
+ if (this.queryType === 'user_defined') {
+ options.filterValue = this.currentType + ':' + this.currentValue;
+ } else {
+ options.filterValue = this.currentValue;
+ }
+ }
this.policyEngineService
- .setBlockData(this.id, this.policyId, { filterValue: this.currentValue })
+ .setBlockData(this.id, this.policyId, options)
.subscribe(() => {
this.loading = false;
}, (e) => {
@@ -129,4 +199,4 @@ export class FiltersAddonBlockComponent implements OnInit {
this.loading = false;
});
}
-}
+}
\ No newline at end of file
diff --git a/frontend/src/app/modules/policy-engine/policy-viewer/blocks/report-block/report-block.component.scss b/frontend/src/app/modules/policy-engine/policy-viewer/blocks/report-block/report-block.component.scss
index 878deb4f49..88314b007c 100644
--- a/frontend/src/app/modules/policy-engine/policy-viewer/blocks/report-block/report-block.component.scss
+++ b/frontend/src/app/modules/policy-engine/policy-viewer/blocks/report-block/report-block.component.scss
@@ -517,7 +517,7 @@ a.open-vp {
.active-multiple-document {
transform: translate(0, 0);
- z-index: 3;
+ z-index: 3 !important;
border: 2px solid gray;
}
@@ -525,7 +525,7 @@ a.open-vp {
position: absolute;
left: 0;
bottom: 0;
- z-index: 2;
+ z-index: 2 !important;
transform: translate(-7px, -7px);
border: 2px solid #9d9d9d;
}
@@ -534,17 +534,17 @@ a.open-vp {
position: absolute;
left: 0;
bottom: 0;
- z-index: 1;
+ z-index: 1 !important;
transform: translate(-14px, -14px);
border: 2px solid #bfbfbf;
}
.single-multiple-document {
- z-index: 1;
+ z-index: 1 !important;
}
.hide-multiple-document {
- display: none;
+ display: none !important;
}
.multiple-documents-count {
diff --git a/frontend/src/app/modules/policy-engine/policy-viewer/blocks/request-document-block/request-document-block.component.html b/frontend/src/app/modules/policy-engine/policy-viewer/blocks/request-document-block/request-document-block.component.html
index 8fdcc2b813..f7994046d5 100644
--- a/frontend/src/app/modules/policy-engine/policy-viewer/blocks/request-document-block/request-document-block.component.html
+++ b/frontend/src/app/modules/policy-engine/policy-viewer/blocks/request-document-block/request-document-block.component.html
@@ -70,6 +70,7 @@
+
+
+
+ Type
+ {{ selectedOption.name }}
+ Not selected
+
+
+
+
+ Equal
+ Equal
+ Not Equal
+ In
+ Not In
+ Greater Than
+ Greater Than or Equal
+ Less Than
+ Less Than or Equal
+
+
+
+
+
+ {{ selectedOption.name }}
+ Not selected
+
+
+
+
+
+
+
+
+
+
{{ title }}
submitText="Create" [rules]="rulesResults" [paginationHidden]="false" + (buttons)="onChangeButtons($event)" >
- radio_button_checked
- Record
-
+
+ radio_button_checked
+ Record
+
-
- play_arrow
- Run
-
+
+ play_arrow
+ Run
+
-
+
+ {{item.unit}}
-
@@ -92,8 +92,8 @@
The field type does not match the field type in the schema
-
@@ -66,19 +66,19 @@
{{item.unit}}
-
-
@@ -103,7 +103,7 @@
{{item.unit}}
-
-
-
+
+
@@ -198,12 +203,17 @@
-
+
+
diff --git a/frontend/src/app/modules/schema-engine/schema-form/controls/controls.module.ts b/frontend/src/app/modules/schema-engine/schema-form/controls/controls.module.ts
new file mode 100644
index 0000000000..598750e4bc
--- /dev/null
+++ b/frontend/src/app/modules/schema-engine/schema-form/controls/controls.module.ts
@@ -0,0 +1,50 @@
+import { NgModule } from '@angular/core';
+import { FormsModule } from '@angular/forms';
+import { DateTimeComponent } from './date-time/date-time.component';
+import { EnumComponent } from './enum/enum';
+import { InputComponent } from './input/input';
+import { InputTextModule } from 'primeng/inputtext';
+import { CalendarModule } from 'primeng/calendar';
+import { InputTextareaModule } from 'primeng/inputtextarea';
+import { InputNumberModule } from 'primeng/inputnumber';
+import { CheckboxModule } from 'primeng/checkbox';
+import { DropdownModule } from 'primeng/dropdown';
+import { NgxMatDatetimePickerModule, NgxMatNativeDateModule, NgxMatTimepickerModule, } from '@angular-material-components/datetime-picker';
+import { MaterialModule } from '../../../common/material.module';
+import { CommonComponentsModule } from '../../../common/common-components.module';
+import { ArtifactEngineModule } from '../../../artifact-engine/artifact-engine.module';
+import { CodemirrorModule } from '@ctrl/ngx-codemirror';
+import { GoogleMapsModule } from '@angular/google-maps';
+
+NgModule({
+ declarations: [
+ DateTimeComponent,
+ EnumComponent,
+ InputComponent
+ ],
+ exports: [
+ DateTimeComponent,
+ EnumComponent,
+ InputComponent
+ ],
+ imports: [
+ CommonComponentsModule,
+ CodemirrorModule,
+ ArtifactEngineModule,
+ GoogleMapsModule,
+ MaterialModule,
+ NgxMatDatetimePickerModule,
+ NgxMatNativeDateModule,
+ NgxMatTimepickerModule,
+ InputTextModule,
+ FormsModule,
+ CalendarModule,
+ InputTextareaModule,
+ CheckboxModule,
+ DropdownModule,
+ InputNumberModule
+ ]
+})
+
+export class ControlsModule{
+}
diff --git a/frontend/src/app/modules/schema-engine/schema-form/controls/date-time/date-time.component.html b/frontend/src/app/modules/schema-engine/schema-form/controls/date-time/date-time.component.html
new file mode 100644
index 0000000000..b90b10294e
--- /dev/null
+++ b/frontend/src/app/modules/schema-engine/schema-form/controls/date-time/date-time.component.html
@@ -0,0 +1,9 @@
+;
+ @Input('value') value?: string;
+ @Input('type') type?: InputType;
+
+ @ViewChild('calendar') calendar: any
+
+ private subscription = new Subscription();
+
+ constructor(
+ private ngZone: NgZone,
+ ) {
+ }
+
+ ngOnInit() {
+ // if (this.item.subject) {
+ this.subscription.add(
+ this.control.valueChanges.subscribe(() => {
+ this.fillField();
+ })
+ );
+ // }
+ }
+
+ ngOnDestroy() {
+ this.subscription.unsubscribe();
+ }
+
+ ngAfterViewInit() {
+ (this.calendar?.el.nativeElement.querySelector('input') as HTMLInputElement).readOnly = true;
+ // if (this.isMany) {
+ this.fillField();
+ // }
+ }
+
+ ngOnChanges() {
+ this.fillField();
+ }
+
+ fillField() {
+ const comment = this.item?.field?.comment && JSON.parse(this.item.field.comment);
+ let value: any = null;
+ if (this.timeOnly && this.type && comment && comment[this.type]) {
+ value = comment[this.type];
+ } else if (this.calendar?.value) {
+ value = this.calendar?.value;
+ } else if (this.item.value) {
+ value = this.item.value;
+ } else if (this.item.preset) {
+ value = this.item.preset;
+ }
+
+ setTimeout(() => {
+ const input = this.calendar?.el.nativeElement.querySelector('input');
+ if (input && value) {
+ if (this.timeOnly) {
+ const date = moment(value, 'hh:mm:ss');
+ this.control.setValue(date.format('HH:mm:ss'), {
+ emitEvent: false,
+ emitModelToViewChange: false
+ });
+ input.value = moment(value, 'hh:mm:ss').format('HH:mm:ss');
+ } else if (!this.showTime) {
+ const date = moment(value, 'YYYY-MM-DD');
+ this.control.setValue(date.format('YYYY-MM-DD'), {
+ emitEvent: false,
+ emitModelToViewChange: false
+ });
+ input.value = moment(value, 'YYYY-MM-DD').format('YYYY-MM-DD');
+ } else {
+ const date = moment(value);
+ this.control.setValue(date.toISOString(), {
+ emitEvent: false,
+ emitModelToViewChange: false
+ })
+ input.value = moment(value).toISOString();
+ }
+ }
+ }, 100)
+ }
+}
diff --git a/frontend/src/app/modules/schema-engine/schema-form/controls/enum/enum.html b/frontend/src/app/modules/schema-engine/schema-form/controls/enum/enum.html
new file mode 100644
index 0000000000..276400ba64
--- /dev/null
+++ b/frontend/src/app/modules/schema-engine/schema-form/controls/enum/enum.html
@@ -0,0 +1,9 @@
+;
+ @Input('value') value?: string;
+
+ @ViewChild('calendar') calendar: any
+
+ private subscription = new Subscription();
+
+ constructor(
+ private ngZone: NgZone,
+ ) {
+ }
+
+ ngOnInit() {
+ if (this.item.subject) {
+ this.item.subject.subscribe(() => {
+ this.fillField();
+ })
+ }
+ }
+
+ ngOnDestroy() {
+ this.subscription.unsubscribe();
+ }
+
+ ngAfterViewInit() {
+ // if (this.isMany) {
+ this.fillField();
+ // }
+ }
+
+ ngOnChanges() {
+ this.fillField();
+ }
+
+ fillField() {
+ const comment = this.item?.field?.comment && JSON.parse(this.item.field.comment);
+ let value: any = null;
+ if (this.value) {
+ value = this.value;
+ } else if (this.timeOnly && comment?.suggest) {
+ value = comment.suggest;
+ } else if (this.calendar?.value) {
+ value = this.calendar?.value;
+ } else if (this.item.value) {
+ value = this.item.value;
+ }
+
+ const input = this.calendar?.el.nativeElement.querySelector('input')
+
+ setTimeout(() => {
+ if (input && value) {
+ if (this.timeOnly) {
+ const date = moment(value, 'hh-mm-ss').toDate();
+ this.control.setValue(date);
+ input.value = value;
+ } else {
+ input.value = moment(value).format('YYYY-MM-DD HH:mm:ss');
+ }
+ }
+ })
+ }
+}
diff --git a/frontend/src/app/modules/schema-engine/schema-form/controls/input/input.html b/frontend/src/app/modules/schema-engine/schema-form/controls/input/input.html
new file mode 100644
index 0000000000..276400ba64
--- /dev/null
+++ b/frontend/src/app/modules/schema-engine/schema-form/controls/input/input.html
@@ -0,0 +1,9 @@
+;
+ @Input('value') value?: string;
+
+ @ViewChild('calendar') calendar: any
+
+ private subscription = new Subscription();
+
+ constructor(
+ private ngZone: NgZone,
+ ) {
+ }
+
+ ngOnInit() {
+ if (this.item.subject) {
+ this.item.subject.subscribe(() => {
+ this.fillField();
+ })
+ }
+ }
+
+ ngOnDestroy() {
+ this.subscription.unsubscribe();
+ }
+
+ ngAfterViewInit() {
+ // if (this.isMany) {
+ this.fillField();
+ // }
+ }
+
+ ngOnChanges() {
+ this.fillField();
+ }
+
+ fillField() {
+ const comment = this.item?.field?.comment && JSON.parse(this.item.field.comment);
+ let value: any = null;
+ if (this.value) {
+ value = this.value;
+ } else if (this.timeOnly && comment?.suggest) {
+ value = comment.suggest;
+ } else if (this.calendar?.value) {
+ value = this.calendar?.value;
+ } else if (this.item.value) {
+ value = this.item.value;
+ }
+
+ const input = this.calendar?.el.nativeElement.querySelector('input')
+
+ setTimeout(() => {
+ if (input && value) {
+ if (this.timeOnly) {
+ const date = moment(value, 'hh-mm-ss').toDate();
+ this.control.setValue(date);
+ input.value = value;
+ } else {
+ input.value = moment(value).format('YYYY-MM-DD HH:mm:ss');
+ }
+ }
+ })
+ }
+}
diff --git a/frontend/src/app/modules/schema-engine/schema-form/schema-form.component.html b/frontend/src/app/modules/schema-engine/schema-form/schema-form.component.html
index 4ee1bf96ff..73acec0558 100644
--- a/frontend/src/app/modules/schema-engine/schema-form/schema-form.component.html
+++ b/frontend/src/app/modules/schema-engine/schema-form/schema-form.component.html
@@ -13,12 +13,12 @@
@@ -138,19 +123,19 @@
@@ -172,22 +157,24 @@
-
-
-
@@ -171,17 +171,22 @@
-
-
-
*
{{ item.description }}
-
+
*
@@ -27,20 +27,22 @@
-
+
Suggestion: {{item.suggest}}
- {{ item.unit }}
-
-
-
-
-
-
-
@@ -122,9 +107,9 @@
{{item.unit}}
-
-
-
+
Suggestion: {{item.suggest}}
- {{ item.unit }}
-
-
-
-
-
-
-
-
+
{{item.unit}}
-
-
@@ -426,7 +405,8 @@
Please make sure all fields in schemas contain a valid value
@@ -440,9 +420,9 @@