diff --git a/canopeum_frontend/src/services/api.ts b/canopeum_frontend/src/services/api.ts
index b561f01fc..6422223af 100644
--- a/canopeum_frontend/src/services/api.ts
+++ b/canopeum_frontend/src/services/api.ts
@@ -140,7 +140,9 @@ export class BatchClient {
create(
site?: number | undefined,
name?: string | null | undefined,
- sponsor?: string | null | undefined,
+ sponsorName?: string | null | undefined,
+ sponsorWebsiteUrl?: string | null | undefined,
+ sponsorLogo?: FileParameter | null | undefined,
size?: number | null | undefined,
soilCondition?: string | null | undefined,
plantCount?: number | null | undefined,
@@ -167,8 +169,18 @@ export class BatchClient {
if (name !== null && name !== undefined) {
content_.append('name', name.toString())
}
- if (sponsor !== null && sponsor !== undefined) {
- content_.append('sponsor', sponsor.toString())
+ if (sponsorName !== null && sponsorName !== undefined) {
+ content_.append('sponsorName', sponsorName.toString())
+ }
+ if (sponsorWebsiteUrl !== null && sponsorWebsiteUrl !== undefined) {
+ content_.append('sponsorWebsiteUrl', sponsorWebsiteUrl.toString())
+ }
+ if (sponsorLogo !== null && sponsorLogo !== undefined) {
+ content_.append(
+ 'sponsorLogo',
+ sponsorLogo.data,
+ sponsorLogo.fileName ? sponsorLogo.fileName : 'sponsorLogo',
+ )
}
if (size !== null && size !== undefined) {
content_.append('size', size.toString())
@@ -264,7 +276,9 @@ export class BatchClient {
update(
batchId: number,
name?: string | null | undefined,
- sponsor?: string | null | undefined,
+ sponsorName?: string | null | undefined,
+ sponsorWebsiteUrl?: string | null | undefined,
+ sponsorLogo?: FileParameter | null | undefined,
size?: number | null | undefined,
soilCondition?: string | null | undefined,
plantCount?: number | null | undefined,
@@ -289,8 +303,18 @@ export class BatchClient {
if (name !== null && name !== undefined) {
content_.append('name', name.toString())
}
- if (sponsor !== null && sponsor !== undefined) {
- content_.append('sponsor', sponsor.toString())
+ if (sponsorName !== null && sponsorName !== undefined) {
+ content_.append('sponsorName', sponsorName.toString())
+ }
+ if (sponsorWebsiteUrl !== null && sponsorWebsiteUrl !== undefined) {
+ content_.append('sponsorWebsiteUrl', sponsorWebsiteUrl.toString())
+ }
+ if (sponsorLogo !== null && sponsorLogo !== undefined) {
+ content_.append(
+ 'sponsorLogo',
+ sponsorLogo.data,
+ sponsorLogo.fileName ? sponsorLogo.fileName : 'sponsorLogo',
+ )
}
if (size !== null && size !== undefined) {
content_.append('size', size.toString())
@@ -1178,7 +1202,7 @@ export class SiteClient {
return Promise.resolve
(null as any)
}
- summary(siteId: number): Promise {
+ summary(siteId: number): Promise {
let url_ = this.baseUrl + '/analytics/sites/{siteId}/summary'
if (siteId === undefined || siteId === null) {
throw new Error("The parameter 'siteId' must be defined.")
@@ -1198,7 +1222,7 @@ export class SiteClient {
})
}
- protected processSummary(response: Response): Promise {
+ protected processSummary(response: Response): Promise {
const status = response.status
let _headers: any = {}
if (response.headers && response.headers.forEach) {
@@ -1210,7 +1234,7 @@ export class SiteClient {
let resultData200 = _responseText === ''
? null
: JSON.parse(_responseText, this.jsonParseReviver)
- result200 = SiteDetailSummary.fromJS(resultData200)
+ result200 = SiteSummaryDetail.fromJS(resultData200)
return result200
})
} else if (status !== 200 && status !== 204) {
@@ -1223,7 +1247,7 @@ export class SiteClient {
)
})
}
- return Promise.resolve(null as any)
+ return Promise.resolve(null as any)
}
map(): Promise {
@@ -3222,24 +3246,23 @@ export interface IAsset {
export class BatchDetail implements IBatchDetail {
readonly id!: number
- readonly fertilizers!: Batchfertilizer[]
- readonly mulchLayers!: BatchMulchLayer[]
- readonly supportedSpecies!: BatchSupportedSpecies[]
+ readonly fertilizers!: FertilizerType[]
+ readonly mulchLayers!: MulchLayerType[]
+ readonly supportedSpecies!: TreeType[]
readonly seeds!: BatchSeed[]
readonly species!: BatchSpecies[]
+ readonly sponsor!: BatchSponsor
image?: Asset
- createdAt?: Date | undefined
- updatedAt?: Date | undefined
+ readonly createdAt!: Date | undefined
+ readonly updatedAt!: Date | undefined
name?: string | undefined
- sponsor?: string | undefined
size?: number | undefined
soilCondition?: string | undefined
- plantCount?: number | undefined
survivedCount?: number | undefined
replaceCount?: number | undefined
totalNumberSeed?: number | undefined
totalPropagation?: number | undefined
- site?: number | undefined;
+ site!: number;
[key: string]: any
@@ -3257,6 +3280,7 @@ export class BatchDetail implements IBatchDetail {
this.supportedSpecies = []
this.seeds = []
this.species = []
+ this.sponsor = new BatchSponsor()
}
}
@@ -3271,19 +3295,19 @@ export class BatchDetail implements IBatchDetail {
if (Array.isArray(_data['fertilizers'])) {
;( this).fertilizers = [] as any
for (let item of _data['fertilizers']) {
- ;( this).fertilizers!.push(Batchfertilizer.fromJS(item))
+ ;( this).fertilizers!.push(FertilizerType.fromJS(item))
}
}
if (Array.isArray(_data['mulchLayers'])) {
;( this).mulchLayers = [] as any
for (let item of _data['mulchLayers']) {
- ;( this).mulchLayers!.push(BatchMulchLayer.fromJS(item))
+ ;( this).mulchLayers!.push(MulchLayerType.fromJS(item))
}
}
if (Array.isArray(_data['supportedSpecies'])) {
;( this).supportedSpecies = [] as any
for (let item of _data['supportedSpecies']) {
- ;( this).supportedSpecies!.push(BatchSupportedSpecies.fromJS(item))
+ ;( this).supportedSpecies!.push(TreeType.fromJS(item))
}
}
if (Array.isArray(_data['seeds'])) {
@@ -3298,18 +3322,19 @@ export class BatchDetail implements IBatchDetail {
;( this).species!.push(BatchSpecies.fromJS(item))
}
}
+ ;( this).sponsor = _data['sponsor']
+ ? BatchSponsor.fromJS(_data['sponsor'])
+ : new BatchSponsor()
this.image = _data['image'] ? Asset.fromJS(_data['image']) : undefined
- this.createdAt = _data['createdAt']
+ ;( this).createdAt = _data['createdAt']
? new Date(_data['createdAt'].toString())
: undefined
- this.updatedAt = _data['updatedAt']
+ ;( this).updatedAt = _data['updatedAt']
? new Date(_data['updatedAt'].toString())
: undefined
this.name = _data['name']
- this.sponsor = _data['sponsor']
this.size = _data['size']
this.soilCondition = _data['soilCondition']
- this.plantCount = _data['plantCount']
this.survivedCount = _data['survivedCount']
this.replaceCount = _data['replaceCount']
this.totalNumberSeed = _data['totalNumberSeed']
@@ -3363,14 +3388,13 @@ export class BatchDetail implements IBatchDetail {
data['species'].push(item.toJSON())
}
}
+ data['sponsor'] = this.sponsor ? this.sponsor.toJSON() : undefined
data['image'] = this.image ? this.image.toJSON() : undefined
data['createdAt'] = this.createdAt ? this.createdAt.toISOString() : undefined
data['updatedAt'] = this.updatedAt ? this.updatedAt.toISOString() : undefined
data['name'] = this.name
- data['sponsor'] = this.sponsor
data['size'] = this.size
data['soilCondition'] = this.soilCondition
- data['plantCount'] = this.plantCount
data['survivedCount'] = this.survivedCount
data['replaceCount'] = this.replaceCount
data['totalNumberSeed'] = this.totalNumberSeed
@@ -3382,92 +3406,31 @@ export class BatchDetail implements IBatchDetail {
export interface IBatchDetail {
id: number
- fertilizers: Batchfertilizer[]
- mulchLayers: BatchMulchLayer[]
- supportedSpecies: BatchSupportedSpecies[]
+ fertilizers: FertilizerType[]
+ mulchLayers: MulchLayerType[]
+ supportedSpecies: TreeType[]
seeds: BatchSeed[]
species: BatchSpecies[]
+ sponsor: BatchSponsor
image?: Asset
- createdAt?: Date | undefined
- updatedAt?: Date | undefined
+ createdAt: Date | undefined
+ updatedAt: Date | undefined
name?: string | undefined
- sponsor?: string | undefined
size?: number | undefined
soilCondition?: string | undefined
- plantCount?: number | undefined
survivedCount?: number | undefined
replaceCount?: number | undefined
totalNumberSeed?: number | undefined
totalPropagation?: number | undefined
- site?: number | undefined
-
- [key: string]: any
-}
-
-export class BatchMulchLayer implements IBatchMulchLayer {
- readonly id!: number
- readonly en!: string
- readonly fr!: string;
-
- [key: string]: any
-
- constructor(data?: IBatchMulchLayer) {
- if (data) {
- for (var property in data) {
- if (data.hasOwnProperty(property)) {
- ;( this)[property] = ( data)[property]
- }
- }
- }
- }
-
- init(_data?: any) {
- if (_data) {
- for (var property in _data) {
- if (_data.hasOwnProperty(property)) {
- this[property] = _data[property]
- }
- }
- ;( this).id = _data['id']
- ;( this).en = _data['en']
- ;( this).fr = _data['fr']
- }
- }
-
- static fromJS(data: any): BatchMulchLayer {
- data = typeof data === 'object' ? data : {}
- let result = new BatchMulchLayer()
- result.init(data)
- return result
- }
-
- toJSON(data?: any) {
- data = typeof data === 'object' ? data : {}
- for (var property in this) {
- if (this.hasOwnProperty(property)) {
- data[property] = this[property]
- }
- }
- data['id'] = this.id
- data['en'] = this.en
- data['fr'] = this.fr
- return data
- }
-}
-
-export interface IBatchMulchLayer {
- id: number
- en: string
- fr: string
+ site: number
[key: string]: any
}
export class BatchSeed implements IBatchSeed {
readonly id!: number
- quantity?: number | undefined
- readonly en!: string
- readonly fr!: string;
+ quantity!: number
+ readonly treeType!: TreeType;
[key: string]: any
@@ -3479,6 +3442,9 @@ export class BatchSeed implements IBatchSeed {
}
}
}
+ if (!data) {
+ this.treeType = new TreeType()
+ }
}
init(_data?: any) {
@@ -3490,8 +3456,9 @@ export class BatchSeed implements IBatchSeed {
}
;( this).id = _data['id']
this.quantity = _data['quantity']
- ;( this).en = _data['en']
- ;( this).fr = _data['fr']
+ ;( this).treeType = _data['treeType']
+ ? TreeType.fromJS(_data['treeType'])
+ : new TreeType()
}
}
@@ -3511,25 +3478,23 @@ export class BatchSeed implements IBatchSeed {
}
data['id'] = this.id
data['quantity'] = this.quantity
- data['en'] = this.en
- data['fr'] = this.fr
+ data['treeType'] = this.treeType ? this.treeType.toJSON() : undefined
return data
}
}
export interface IBatchSeed {
- quantity?: number | undefined
- en: string
- fr: string
+ id: number
+ quantity: number
+ treeType: TreeType
[key: string]: any
}
export class BatchSpecies implements IBatchSpecies {
readonly id!: number
- quantity?: number | undefined
- readonly en!: string
- readonly fr!: string;
+ quantity!: number
+ readonly treeType!: TreeType;
[key: string]: any
@@ -3541,6 +3506,9 @@ export class BatchSpecies implements IBatchSpecies {
}
}
}
+ if (!data) {
+ this.treeType = new TreeType()
+ }
}
init(_data?: any) {
@@ -3552,8 +3520,9 @@ export class BatchSpecies implements IBatchSpecies {
}
;( this).id = _data['id']
this.quantity = _data['quantity']
- ;( this).en = _data['en']
- ;( this).fr = _data['fr']
+ ;( this).treeType = _data['treeType']
+ ? TreeType.fromJS(_data['treeType'])
+ : new TreeType()
}
}
@@ -3573,87 +3542,28 @@ export class BatchSpecies implements IBatchSpecies {
}
data['id'] = this.id
data['quantity'] = this.quantity
- data['en'] = this.en
- data['fr'] = this.fr
+ data['treeType'] = this.treeType ? this.treeType.toJSON() : undefined
return data
}
}
export interface IBatchSpecies {
- quantity?: number | undefined
- en: string
- fr: string
-
- [key: string]: any
-}
-
-export class BatchSupportedSpecies implements IBatchSupportedSpecies {
- readonly id!: number
- readonly en!: string
- readonly fr!: string;
-
- [key: string]: any
-
- constructor(data?: IBatchSupportedSpecies) {
- if (data) {
- for (var property in data) {
- if (data.hasOwnProperty(property)) {
- ;( this)[property] = ( data)[property]
- }
- }
- }
- }
-
- init(_data?: any) {
- if (_data) {
- for (var property in _data) {
- if (_data.hasOwnProperty(property)) {
- this[property] = _data[property]
- }
- }
- ;( this).id = _data['id']
- ;( this).en = _data['en']
- ;( this).fr = _data['fr']
- }
- }
-
- static fromJS(data: any): BatchSupportedSpecies {
- data = typeof data === 'object' ? data : {}
- let result = new BatchSupportedSpecies()
- result.init(data)
- return result
- }
-
- toJSON(data?: any) {
- data = typeof data === 'object' ? data : {}
- for (var property in this) {
- if (this.hasOwnProperty(property)) {
- data[property] = this[property]
- }
- }
- data['id'] = this.id
- data['en'] = this.en
- data['fr'] = this.fr
- return data
- }
-}
-
-export interface IBatchSupportedSpecies {
id: number
- en: string
- fr: string
+ quantity: number
+ treeType: TreeType
[key: string]: any
}
-export class Batchfertilizer implements IBatchfertilizer {
+export class BatchSponsor implements IBatchSponsor {
readonly id!: number
- readonly en!: string
- readonly fr!: string;
+ logo!: Asset
+ name!: string
+ url!: string;
[key: string]: any
- constructor(data?: IBatchfertilizer) {
+ constructor(data?: IBatchSponsor) {
if (data) {
for (var property in data) {
if (data.hasOwnProperty(property)) {
@@ -3661,6 +3571,9 @@ export class Batchfertilizer implements IBatchfertilizer {
}
}
}
+ if (!data) {
+ this.logo = new Asset()
+ }
}
init(_data?: any) {
@@ -3671,14 +3584,15 @@ export class Batchfertilizer implements IBatchfertilizer {
}
}
;( this).id = _data['id']
- ;( this).en = _data['en']
- ;( this).fr = _data['fr']
+ this.logo = _data['logo'] ? Asset.fromJS(_data['logo']) : new Asset()
+ this.name = _data['name']
+ this.url = _data['url']
}
}
- static fromJS(data: any): Batchfertilizer {
+ static fromJS(data: any): BatchSponsor {
data = typeof data === 'object' ? data : {}
- let result = new Batchfertilizer()
+ let result = new BatchSponsor()
result.init(data)
return result
}
@@ -3691,16 +3605,18 @@ export class Batchfertilizer implements IBatchfertilizer {
}
}
data['id'] = this.id
- data['en'] = this.en
- data['fr'] = this.fr
+ data['logo'] = this.logo ? this.logo.toJSON() : undefined
+ data['name'] = this.name
+ data['url'] = this.url
return data
}
}
-export interface IBatchfertilizer {
+export interface IBatchSponsor {
id: number
- en: string
- fr: string
+ logo: Asset
+ name: string
+ url: string
[key: string]: any
}
@@ -5192,145 +5108,6 @@ export interface ISiteAdmin {
[key: string]: any
}
-export class SiteDetailSummary implements ISiteDetailSummary {
- readonly id!: number
- name!: string
- coordinate!: Coordinates
- siteType!: SiteType
- readonly plantCount!: number
- readonly survivedCount!: number
- readonly propagationCount!: number
- visitorCount?: number | undefined
- readonly sponsors!: string[]
- readonly progress!: number
- admins!: SiteAdmin[]
- readonly batches!: BatchDetail[]
- readonly weather!: Weather;
-
- [key: string]: any
-
- constructor(data?: ISiteDetailSummary) {
- if (data) {
- for (var property in data) {
- if (data.hasOwnProperty(property)) {
- ;( this)[property] = ( data)[property]
- }
- }
- }
- if (!data) {
- this.coordinate = new Coordinates()
- this.siteType = new SiteType()
- this.sponsors = []
- this.admins = []
- this.batches = []
- this.weather = new Weather()
- }
- }
-
- init(_data?: any) {
- if (_data) {
- for (var property in _data) {
- if (_data.hasOwnProperty(property)) {
- this[property] = _data[property]
- }
- }
- ;( this).id = _data['id']
- this.name = _data['name']
- this.coordinate = _data['coordinate']
- ? Coordinates.fromJS(_data['coordinate'])
- : new Coordinates()
- this.siteType = _data['siteType'] ? SiteType.fromJS(_data['siteType']) : new SiteType()
- ;( this).plantCount = _data['plantCount']
- ;( this).survivedCount = _data['survivedCount']
- ;( this).propagationCount = _data['propagationCount']
- this.visitorCount = _data['visitorCount']
- if (Array.isArray(_data['sponsors'])) {
- ;( this).sponsors = [] as any
- for (let item of _data['sponsors']) {
- ;( this).sponsors!.push(item)
- }
- }
- ;( this).progress = _data['progress']
- if (Array.isArray(_data['admins'])) {
- this.admins = [] as any
- for (let item of _data['admins']) {
- this.admins!.push(SiteAdmin.fromJS(item))
- }
- }
- if (Array.isArray(_data['batches'])) {
- ;( this).batches = [] as any
- for (let item of _data['batches']) {
- ;( this).batches!.push(BatchDetail.fromJS(item))
- }
- }
- ;( this).weather = _data['weather'] ? Weather.fromJS(_data['weather']) : new Weather()
- }
- }
-
- static fromJS(data: any): SiteDetailSummary {
- data = typeof data === 'object' ? data : {}
- let result = new SiteDetailSummary()
- result.init(data)
- return result
- }
-
- toJSON(data?: any) {
- data = typeof data === 'object' ? data : {}
- for (var property in this) {
- if (this.hasOwnProperty(property)) {
- data[property] = this[property]
- }
- }
- data['id'] = this.id
- data['name'] = this.name
- data['coordinate'] = this.coordinate ? this.coordinate.toJSON() : undefined
- data['siteType'] = this.siteType ? this.siteType.toJSON() : undefined
- data['plantCount'] = this.plantCount
- data['survivedCount'] = this.survivedCount
- data['propagationCount'] = this.propagationCount
- data['visitorCount'] = this.visitorCount
- if (Array.isArray(this.sponsors)) {
- data['sponsors'] = []
- for (let item of this.sponsors) {
- data['sponsors'].push(item)
- }
- }
- data['progress'] = this.progress
- if (Array.isArray(this.admins)) {
- data['admins'] = []
- for (let item of this.admins) {
- data['admins'].push(item.toJSON())
- }
- }
- if (Array.isArray(this.batches)) {
- data['batches'] = []
- for (let item of this.batches) {
- data['batches'].push(item.toJSON())
- }
- }
- data['weather'] = this.weather ? this.weather.toJSON() : undefined
- return data
- }
-}
-
-export interface ISiteDetailSummary {
- id: number
- name: string
- coordinate: Coordinates
- siteType: SiteType
- plantCount: number
- survivedCount: number
- propagationCount: number
- visitorCount?: number | undefined
- sponsors: string[]
- progress: number
- admins: SiteAdmin[]
- batches: BatchDetail[]
- weather: Weather
-
- [key: string]: any
-}
-
export class SiteMap implements ISiteMap {
readonly id!: number
name!: string
@@ -5531,7 +5308,7 @@ export class SiteSocial implements ISiteSocial {
description?: string | undefined
contact!: Contact
announcement!: Announcement
- readonly sponsors!: string[]
+ readonly sponsors!: BatchSponsor[]
readonly widget!: Widget[];
[key: string]: any
@@ -5574,7 +5351,7 @@ export class SiteSocial implements ISiteSocial {
if (Array.isArray(_data['sponsors'])) {
;( this).sponsors = [] as any
for (let item of _data['sponsors']) {
- ;( this).sponsors!.push(item)
+ ;( this).sponsors!.push(BatchSponsor.fromJS(item))
}
}
if (Array.isArray(_data['widget'])) {
@@ -5611,7 +5388,7 @@ export class SiteSocial implements ISiteSocial {
if (Array.isArray(this.sponsors)) {
data['sponsors'] = []
for (let item of this.sponsors) {
- data['sponsors'].push(item)
+ data['sponsors'].push(item.toJSON())
}
}
if (Array.isArray(this.widget)) {
@@ -5633,7 +5410,7 @@ export interface ISiteSocial {
description?: string | undefined
contact: Contact
announcement: Announcement
- sponsors: string[]
+ sponsors: BatchSponsor[]
widget: Widget[]
[key: string]: any
@@ -5645,17 +5422,137 @@ export class SiteSummary implements ISiteSummary {
coordinate!: Coordinates
siteType!: SiteType
readonly plantCount!: number
+ readonly sponsorProgress!: number
readonly survivedCount!: number
readonly propagationCount!: number
visitorCount?: number | undefined
- readonly sponsors!: string[]
- readonly progress!: number
admins!: SiteAdmin[]
readonly batches!: BatchDetail[];
[key: string]: any
constructor(data?: ISiteSummary) {
+ if (data) {
+ for (var property in data) {
+ if (data.hasOwnProperty(property)) {
+ ;( this)[property] = ( data)[property]
+ }
+ }
+ }
+ if (!data) {
+ this.coordinate = new Coordinates()
+ this.siteType = new SiteType()
+ this.admins = []
+ this.batches = []
+ }
+ }
+
+ init(_data?: any) {
+ if (_data) {
+ for (var property in _data) {
+ if (_data.hasOwnProperty(property)) {
+ this[property] = _data[property]
+ }
+ }
+ ;( this).id = _data['id']
+ this.name = _data['name']
+ this.coordinate = _data['coordinate']
+ ? Coordinates.fromJS(_data['coordinate'])
+ : new Coordinates()
+ this.siteType = _data['siteType'] ? SiteType.fromJS(_data['siteType']) : new SiteType()
+ ;( this).plantCount = _data['plantCount']
+ ;( this).sponsorProgress = _data['sponsorProgress']
+ ;( this).survivedCount = _data['survivedCount']
+ ;( this).propagationCount = _data['propagationCount']
+ this.visitorCount = _data['visitorCount']
+ if (Array.isArray(_data['admins'])) {
+ this.admins = [] as any
+ for (let item of _data['admins']) {
+ this.admins!.push(SiteAdmin.fromJS(item))
+ }
+ }
+ if (Array.isArray(_data['batches'])) {
+ ;( this).batches = [] as any
+ for (let item of _data['batches']) {
+ ;( this).batches!.push(BatchDetail.fromJS(item))
+ }
+ }
+ }
+ }
+
+ static fromJS(data: any): SiteSummary {
+ data = typeof data === 'object' ? data : {}
+ let result = new SiteSummary()
+ result.init(data)
+ return result
+ }
+
+ toJSON(data?: any) {
+ data = typeof data === 'object' ? data : {}
+ for (var property in this) {
+ if (this.hasOwnProperty(property)) {
+ data[property] = this[property]
+ }
+ }
+ data['id'] = this.id
+ data['name'] = this.name
+ data['coordinate'] = this.coordinate ? this.coordinate.toJSON() : undefined
+ data['siteType'] = this.siteType ? this.siteType.toJSON() : undefined
+ data['plantCount'] = this.plantCount
+ data['sponsorProgress'] = this.sponsorProgress
+ data['survivedCount'] = this.survivedCount
+ data['propagationCount'] = this.propagationCount
+ data['visitorCount'] = this.visitorCount
+ if (Array.isArray(this.admins)) {
+ data['admins'] = []
+ for (let item of this.admins) {
+ data['admins'].push(item.toJSON())
+ }
+ }
+ if (Array.isArray(this.batches)) {
+ data['batches'] = []
+ for (let item of this.batches) {
+ data['batches'].push(item.toJSON())
+ }
+ }
+ return data
+ }
+}
+
+export interface ISiteSummary {
+ id: number
+ name: string
+ coordinate: Coordinates
+ siteType: SiteType
+ plantCount: number
+ sponsorProgress: number
+ survivedCount: number
+ propagationCount: number
+ visitorCount?: number | undefined
+ admins: SiteAdmin[]
+ batches: BatchDetail[]
+
+ [key: string]: any
+}
+
+export class SiteSummaryDetail implements ISiteSummaryDetail {
+ readonly id!: number
+ name!: string
+ coordinate!: Coordinates
+ siteType!: SiteType
+ readonly plantCount!: number
+ readonly sponsorProgress!: number
+ readonly survivedCount!: number
+ readonly propagationCount!: number
+ visitorCount?: number | undefined
+ readonly sponsors!: BatchSponsor[]
+ admins!: SiteAdmin[]
+ readonly batches!: BatchDetail[]
+ readonly weather!: Weather;
+
+ [key: string]: any
+
+ constructor(data?: ISiteSummaryDetail) {
if (data) {
for (var property in data) {
if (data.hasOwnProperty(property)) {
@@ -5669,6 +5566,7 @@ export class SiteSummary implements ISiteSummary {
this.sponsors = []
this.admins = []
this.batches = []
+ this.weather = new Weather()
}
}
@@ -5686,16 +5584,16 @@ export class SiteSummary implements ISiteSummary {
: new Coordinates()
this.siteType = _data['siteType'] ? SiteType.fromJS(_data['siteType']) : new SiteType()
;( this).plantCount = _data['plantCount']
+ ;( this).sponsorProgress = _data['sponsorProgress']
;( this).survivedCount = _data['survivedCount']
;( this).propagationCount = _data['propagationCount']
this.visitorCount = _data['visitorCount']
if (Array.isArray(_data['sponsors'])) {
;( this).sponsors = [] as any
for (let item of _data['sponsors']) {
- ;( this).sponsors!.push(item)
+ ;( this).sponsors!.push(BatchSponsor.fromJS(item))
}
}
- ;( this).progress = _data['progress']
if (Array.isArray(_data['admins'])) {
this.admins = [] as any
for (let item of _data['admins']) {
@@ -5708,12 +5606,13 @@ export class SiteSummary implements ISiteSummary {
;( this).batches!.push(BatchDetail.fromJS(item))
}
}
+ ;( this).weather = _data['weather'] ? Weather.fromJS(_data['weather']) : new Weather()
}
}
- static fromJS(data: any): SiteSummary {
+ static fromJS(data: any): SiteSummaryDetail {
data = typeof data === 'object' ? data : {}
- let result = new SiteSummary()
+ let result = new SiteSummaryDetail()
result.init(data)
return result
}
@@ -5730,16 +5629,16 @@ export class SiteSummary implements ISiteSummary {
data['coordinate'] = this.coordinate ? this.coordinate.toJSON() : undefined
data['siteType'] = this.siteType ? this.siteType.toJSON() : undefined
data['plantCount'] = this.plantCount
+ data['sponsorProgress'] = this.sponsorProgress
data['survivedCount'] = this.survivedCount
data['propagationCount'] = this.propagationCount
data['visitorCount'] = this.visitorCount
if (Array.isArray(this.sponsors)) {
data['sponsors'] = []
for (let item of this.sponsors) {
- data['sponsors'].push(item)
+ data['sponsors'].push(item.toJSON())
}
}
- data['progress'] = this.progress
if (Array.isArray(this.admins)) {
data['admins'] = []
for (let item of this.admins) {
@@ -5752,23 +5651,25 @@ export class SiteSummary implements ISiteSummary {
data['batches'].push(item.toJSON())
}
}
+ data['weather'] = this.weather ? this.weather.toJSON() : undefined
return data
}
}
-export interface ISiteSummary {
+export interface ISiteSummaryDetail {
id: number
name: string
coordinate: Coordinates
siteType: SiteType
plantCount: number
+ sponsorProgress: number
survivedCount: number
propagationCount: number
visitorCount?: number | undefined
- sponsors: string[]
- progress: number
+ sponsors: BatchSponsor[]
admins: SiteAdmin[]
batches: BatchDetail[]
+ weather: Weather
[key: string]: any
}
@@ -5834,7 +5735,7 @@ export interface ISiteType {
export class Sitetreespecies implements ISitetreespecies {
readonly id!: number
- quantity?: number | undefined
+ quantity!: number
readonly en!: string
readonly fr!: string;
@@ -5888,7 +5789,7 @@ export class Sitetreespecies implements ISitetreespecies {
export interface ISitetreespecies {
id: number
- quantity?: number | undefined
+ quantity: number
en: string
fr: string
diff --git a/docker-compose.yml b/docker-compose.yml
index 4edc6e215..dceace555 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,3 +1,4 @@
+version: '3.7'
services:
mysql:
hostname: mysql