Skip to content

Commit

Permalink
Merge branch 'main' into prod
Browse files Browse the repository at this point in the history
  • Loading branch information
@micnori
micnori committed Sep 19, 2024
2 parents 764a5f5 + 6cecb1a commit bcdd671
Show file tree
Hide file tree
Showing 7 changed files with 437 additions and 48 deletions.
16 changes: 16 additions & 0 deletions src/app/core/api/generated/model/campaignPlacement.ts
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
/**
* Play&Go Project
* No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
*
* OpenAPI spec version: 2.0
* Contact: [email protected]
*
* NOTE: This class is auto generated by the swagger code generator program.
* https://github.com/swagger-api/swagger-codegen.git
* Do not edit the class manually.
*/
export interface CampaignPlacement {
active?: boolean;
title?: { [key: string]: string };
configuration?: any;
}
158 changes: 158 additions & 0 deletions src/app/pages/campaign/campaign-add-form/campaign-add-form.component.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,63 @@ <h1 style="width: 100%;margin-bottom: 0px;">{{'addCampaign' | translate}}</h1>
</div>
<div
*ngIf="!!validatingForm && !!validatingForm.get('type').value && validatingForm.get('type').value==='company'">
<mat-card-header style="border-bottom: 1px black solid; font-weight: bold;">
{{"placement" | translate}}
</mat-card-header>
<div class="in-line-forms" style="margin-top: 20px">
<mat-form-field appearance="fill" class="input-half-left">
<mat-label>{{'placementActive' | translate}}</mat-label>
<mat-select id="placementActive" formControlName="placementActive">
<mat-option *ngFor="let val of [true,false]" [value]="val">{{ transformActiveBoolean(val)
|translate}}</mat-option>
</mat-select>
</mat-form-field>
<mat-form-field appearance="fill" class="input-half-right">
<mat-label>{{'campaignPlacementMeans' | translate}}</mat-label>
<mat-select id="campaignPlacementMeans" formControlName="campaignPlacementMeans">
<mat-option *ngFor="let val of [true,false]" [value]="val">{{ transformActiveBoolean(val)
|translate}}</mat-option>
</mat-select>
</mat-form-field>
</div>
<div class="in-line-forms">
<mat-form-field appearance="fill" class="input-half-left">
<mat-label>{{'campaignPlacementMetrics' | translate}}</mat-label>
<mat-select id="campaignPlacementMetrics" formControlName="campaignPlacementMetrics" multiple>
<mat-option *ngFor="let value of getCampaignPlacementMetrics()" [value]="value">{{value |translate}}</mat-option>
</mat-select>
</mat-form-field>
<mat-form-field appearance="fill" class="input-half-right">
<mat-label>{{'defaultPlacementMetric' | translate}}</mat-label>
<mat-select id="campaignDefaultPlacementMetric" formControlName="campaignDefaultPlacementMetric">
<mat-option *ngFor="let value of getSelectedCampaignPlacementMetrics()" [value]="value">{{value |translate}}</mat-option>
</mat-select>
</mat-form-field>
</div>
<div class="in-line-forms">
<mat-form-field appearance="fill" class="input-half-left">
<mat-label>{{'campaignPlacementPeriods' | translate}}</mat-label>
<mat-select id="campaignPlacementPeriods" formControlName="campaignPlacementPeriods" multiple>
<mat-option *ngFor="let value of getCampaignPlacementPeriods()" [value]="value">{{value |translate}}</mat-option>
</mat-select>
</mat-form-field>
<mat-form-field appearance="fill" class="input-half-right">
<mat-label>{{'defaultPlacementPeriod' | translate}}</mat-label>
<mat-select id="campaignDefaultPlacementPeriod" formControlName="campaignDefaultPlacementPeriod">
<mat-option *ngFor="let value of getSelectedCampaignPlacementPeriods()" [value]="value">{{value |translate}}</mat-option>
</mat-select>
</mat-form-field>
</div>
<div class="in-line-forms">
<mat-form-field appearance="fill" class="input-half-left">
<mat-label>{{'placementTitleIt' | translate}}</mat-label>
<input matInput id="placementTitleIt" formControlName="placementTitleIt" type="text" [placeholder]="'placementTitleItPlaceholder' | translate">
</mat-form-field>
<mat-form-field appearance="fill" class="input-half-right">
<mat-label>{{'placementTitleEn' | translate}}</mat-label>
<input matInput id="placementTitleEn" formControlName="placementTitleEn" type="text" [placeholder]="'placementTitleEnPlaceholder' | translate">
</mat-form-field>
</div>
<mat-card-header style="border-bottom: 1px black solid; font-weight: bold;">
{{"modality" | translate}}
</mat-card-header>
Expand Down Expand Up @@ -218,6 +275,28 @@ <h1 style="width: 100%;margin-bottom: 0px;">{{'addCampaign' | translate}}</h1>
<input matInput id="monthlyLimitTripsNumber" formControlName="monthlyLimitTripsNumber" type="text">
</mat-form-field>
</mat-grid-tile>
<mat-grid-tile>
{{"firstLimitBar" | translate}}
</mat-grid-tile>
<mat-grid-tile>
<mat-form-field appearance="fill" class="grid-tile-limit" style="margin-right: 10px">
<mat-select id="firstLimitBar" formControlName="firstLimitBar">
<mat-option value="noLimitBar">{{'noLimitBar' |translate}}</mat-option>
<mat-option *ngFor="let value of getLimits()" [value]="value">{{value |translate}}</mat-option>
</mat-select>
</mat-form-field>
</mat-grid-tile>
<mat-grid-tile>
{{"secondLimitBar" | translate}}
</mat-grid-tile>
<mat-grid-tile>
<mat-form-field appearance="fill" class="grid-tile-limit" style="margin-right: 10px">
<mat-select id="secondLimitBar" formControlName="secondLimitBar">
<mat-option value="noLimitBar">{{'noLimitBar' |translate}}</mat-option>
<mat-option *ngFor="let value of getLimits()" [value]="value">{{value |translate}}</mat-option>
</mat-select>
</mat-form-field>
</mat-grid-tile>
</mat-grid-list>
</div>
</div>
Expand Down Expand Up @@ -619,6 +698,63 @@ <h1 style="width: 100%;margin-bottom: 0px;">{{'modifyCampaign' | translate}} -
</div>
<div
*ngIf="!!validatingForm && !!validatingForm.get('type').value && validatingForm.get('type').value==='company'">
<mat-card-header style="border-bottom: 1px black solid; font-weight: bold;">
{{"placement" | translate}}
</mat-card-header>
<div class="in-line-forms" style="margin-top: 20px">
<mat-form-field appearance="fill" class="input-half-left">
<mat-label>{{'placementActive' | translate}}</mat-label>
<mat-select id="placementActive" formControlName="placementActive">
<mat-option *ngFor="let val of [true,false]" [value]="val">{{ transformActiveBoolean(val)
|translate}}</mat-option>
</mat-select>
</mat-form-field>
<mat-form-field appearance="fill" class="input-half-right">
<mat-label>{{'campaignPlacementMeans' | translate}}</mat-label>
<mat-select id="campaignPlacementMeans" formControlName="campaignPlacementMeans">
<mat-option *ngFor="let val of [true,false]" [value]="val">{{ transformActiveBoolean(val)
|translate}}</mat-option>
</mat-select>
</mat-form-field>
</div>
<div class="in-line-forms">
<mat-form-field appearance="fill" class="input-half-left">
<mat-label>{{'campaignPlacementMetrics' | translate}}</mat-label>
<mat-select id="campaignPlacementMetrics" formControlName="campaignPlacementMetrics" multiple>
<mat-option *ngFor="let value of getCampaignPlacementMetrics()" [value]="value">{{value |translate}}</mat-option>
</mat-select>
</mat-form-field>
<mat-form-field appearance="fill" class="input-half-right">
<mat-label>{{'defaultPlacementMetric' | translate}}</mat-label>
<mat-select id="campaignDefaultPlacementMetric" formControlName="campaignDefaultPlacementMetric">
<mat-option *ngFor="let value of getSelectedCampaignPlacementMetrics()" [value]="value">{{value |translate}}</mat-option>
</mat-select>
</mat-form-field>
</div>
<div class="in-line-forms">
<mat-form-field appearance="fill" class="input-half-left">
<mat-label>{{'campaignPlacementPeriods' | translate}}</mat-label>
<mat-select id="campaignPlacementPeriods" formControlName="campaignPlacementPeriods" multiple>
<mat-option *ngFor="let value of getCampaignPlacementPeriods()" [value]="value">{{value |translate}}</mat-option>
</mat-select>
</mat-form-field>
<mat-form-field appearance="fill" class="input-half-right">
<mat-label>{{'defaultPlacementPeriod' | translate}}</mat-label>
<mat-select id="campaignDefaultPlacementPeriod" formControlName="campaignDefaultPlacementPeriod">
<mat-option *ngFor="let value of getSelectedCampaignPlacementPeriods()" [value]="value">{{value |translate}}</mat-option>
</mat-select>
</mat-form-field>
</div>
<div class="in-line-forms">
<mat-form-field appearance="fill" class="input-half-left">
<mat-label>{{'placementTitleIt' | translate}}</mat-label>
<input matInput id="placementTitleIt" formControlName="placementTitleIt" type="text" [placeholder]="'placementTitleItPlaceholder' | translate">
</mat-form-field>
<mat-form-field appearance="fill" class="input-half-right">
<mat-label>{{'placementTitleEn' | translate}}</mat-label>
<input matInput id="placementTitleEn" formControlName="placementTitleEn" type="text" [placeholder]="'placementTitleEnPlaceholder' | translate">
</mat-form-field>
</div>
<mat-card-header style="border-bottom: 1px black solid; font-weight: bold;">
{{"modality" | translate}}
</mat-card-header>
Expand Down Expand Up @@ -751,6 +887,28 @@ <h1 style="width: 100%;margin-bottom: 0px;">{{'modifyCampaign' | translate}} -
<input matInput id="monthlyLimitTripsNumber" formControlName="monthlyLimitTripsNumber" type="text">
</mat-form-field>
</mat-grid-tile>
<mat-grid-tile>
{{"firstLimitBar" | translate}}
</mat-grid-tile>
<mat-grid-tile>
<mat-form-field appearance="fill" class="grid-tile-limit" style="margin-right: 10px">
<mat-select id="firstLimitBar" formControlName="firstLimitBar">
<mat-option value="noLimitBar">{{'noLimitBar' |translate}}</mat-option>
<mat-option *ngFor="let value of getLimits()" [value]="value">{{value |translate}}</mat-option>
</mat-select>
</mat-form-field>
</mat-grid-tile>
<mat-grid-tile>
{{"secondLimitBar" | translate}}
</mat-grid-tile>
<mat-grid-tile>
<mat-form-field appearance="fill" class="grid-tile-limit" style="margin-right: 10px">
<mat-select id="secondLimitBar" formControlName="secondLimitBar">
<mat-option value="noLimitBar">{{'noLimitBar' |translate}}</mat-option>
<mat-option *ngFor="let value of getLimits()" [value]="value">{{value |translate}}</mat-option>
</mat-select>
</mat-form-field>
</mat-grid-tile>
</mat-grid-list>
</div>
</div>
Expand Down
Loading

0 comments on commit bcdd671

Please sign in to comment.