diff --git a/src/app/components/calculator/calculator.component.html b/src/app/components/calculator/calculator.component.html index 5dc2d32..eb0baef 100644 --- a/src/app/components/calculator/calculator.component.html +++ b/src/app/components/calculator/calculator.component.html @@ -2,7 +2,7 @@ Calcul de taille de voile - DT48 - 13 mars 2020 + DT48 - 08 février 2024
diff --git a/src/app/components/calculator/calculator.component.ts b/src/app/components/calculator/calculator.component.ts index 388377d..0964cbb 100644 --- a/src/app/components/calculator/calculator.component.ts +++ b/src/app/components/calculator/calculator.component.ts @@ -37,7 +37,7 @@ export class CalculatorComponent implements OnInit, OnDestroy { //private _currentUser!: Subscription; // = new Subscription(); private _subscriptions: Array = []; public title = 'Calcul de taille de voile'; - public subtitle = 'DT48 - 13 mars 2020'; + public subtitle = 'DT48 - 08 février 2024'; public lastjump: Jump = {} as Jump; public currentUser: User = {} as User; public displayedColumns: Array = ['weight']; diff --git a/src/app/components/shared/dialogs/index.ts b/src/app/components/jump/dialogs/index.ts similarity index 100% rename from src/app/components/shared/dialogs/index.ts rename to src/app/components/jump/dialogs/index.ts diff --git a/src/app/components/shared/dialogs/jump-add.dialog.html b/src/app/components/jump/dialogs/jump-add.dialog.html similarity index 100% rename from src/app/components/shared/dialogs/jump-add.dialog.html rename to src/app/components/jump/dialogs/jump-add.dialog.html diff --git a/src/app/components/shared/dialogs/jump-add.dialog.ts b/src/app/components/jump/dialogs/jump-add.dialog.ts similarity index 100% rename from src/app/components/shared/dialogs/jump-add.dialog.ts rename to src/app/components/jump/dialogs/jump-add.dialog.ts diff --git a/src/app/components/shared/dialogs/jump-delete.dialog.html b/src/app/components/jump/dialogs/jump-delete.dialog.html similarity index 100% rename from src/app/components/shared/dialogs/jump-delete.dialog.html rename to src/app/components/jump/dialogs/jump-delete.dialog.html diff --git a/src/app/components/shared/dialogs/jump-delete.dialog.ts b/src/app/components/jump/dialogs/jump-delete.dialog.ts similarity index 100% rename from src/app/components/shared/dialogs/jump-delete.dialog.ts rename to src/app/components/jump/dialogs/jump-delete.dialog.ts diff --git a/src/app/components/shared/dialogs/jump-edit.dialog.html b/src/app/components/jump/dialogs/jump-edit.dialog.html similarity index 100% rename from src/app/components/shared/dialogs/jump-edit.dialog.html rename to src/app/components/jump/dialogs/jump-edit.dialog.html diff --git a/src/app/components/shared/dialogs/jump-edit.dialog.ts b/src/app/components/jump/dialogs/jump-edit.dialog.ts similarity index 100% rename from src/app/components/shared/dialogs/jump-edit.dialog.ts rename to src/app/components/jump/dialogs/jump-edit.dialog.ts diff --git a/src/app/components/shared/dialogs/jump-view.dialog.html b/src/app/components/jump/dialogs/jump-view.dialog.html similarity index 100% rename from src/app/components/shared/dialogs/jump-view.dialog.html rename to src/app/components/jump/dialogs/jump-view.dialog.html diff --git a/src/app/components/shared/dialogs/jump-view.dialog.ts b/src/app/components/jump/dialogs/jump-view.dialog.ts similarity index 100% rename from src/app/components/shared/dialogs/jump-view.dialog.ts rename to src/app/components/jump/dialogs/jump-view.dialog.ts diff --git a/src/app/components/jump/jump.component.ts b/src/app/components/jump/jump.component.ts index d34a4e1..0fa9a43 100644 --- a/src/app/components/jump/jump.component.ts +++ b/src/app/components/jump/jump.component.ts @@ -11,7 +11,7 @@ import { take } from 'rxjs/operators'; import { Errors, Jump, User } from 'src/app/core/models'; import { JumpsService, UserService } from 'src/app/core/services'; -import { JumpDeleteDialogComponent, JumpEditDialogComponent } from 'src/app/components/shared/dialogs' +import { JumpDeleteDialogComponent, JumpEditDialogComponent } from 'src/app/components/jump/dialogs' @Component({ standalone: true, diff --git a/src/app/components/shared/helpers-jump/jump-table.component.ts b/src/app/components/shared/helpers-jump/jump-table.component.ts index b0b027e..b310b43 100644 --- a/src/app/components/shared/helpers-jump/jump-table.component.ts +++ b/src/app/components/shared/helpers-jump/jump-table.component.ts @@ -21,7 +21,7 @@ import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader'; import { ColumnDefinition, Errors, Jump, JumpList, JumpListConfig, jumpColumns } from 'src/app/core/models'; import { JumpsService, JumpTableService } from 'src/app/core/services'; -import { JumpAddDialogComponent, JumpDeleteDialogComponent, JumpEditDialogComponent, JumpViewDialogComponent } from 'src/app/components/shared/dialogs' +import { JumpAddDialogComponent, JumpDeleteDialogComponent, JumpEditDialogComponent, JumpViewDialogComponent } from 'src/app/components/jump/dialogs' @Component({ standalone: true, diff --git a/src/app/components/shared/index.ts b/src/app/components/shared/index.ts index 4f97ad6..b94a2b4 100644 --- a/src/app/components/shared/index.ts +++ b/src/app/components/shared/index.ts @@ -1,6 +1,6 @@ export * from './accordion'; export * from './confirmed.validator'; -export * from './dialogs'; +export * from '../jump/dialogs'; export * from './helpers-jump'; export * from './layout/header.component'; export * from './layout/footer.component'; diff --git a/src/app/core/models/calculator.model.ts b/src/app/core/models/calculator.model.ts index 6db9aa5..62247b6 100644 --- a/src/app/core/models/calculator.model.ts +++ b/src/app/core/models/calculator.model.ts @@ -49,7 +49,63 @@ export interface WeightSizes { data: WeightSize[]; } +/* DT48 - 08 février 2024 */ export const weightSizes: WeightSize[] = [ + {weight: 60, active: '', ranges: [{num: 1, active: '', name: 'range_1', label: '0 à 99', start: 0, end: 99, value: 175}, {num: 2, active: '', name: 'range_2', label: '100 à 249', start: 100, end: 249, value: 161}, {num: 3, active: '', name: 'range_3', label: '250 à 399', start: 250, end: 399, value: 147}, {num: 4, active: '', name: 'range_4', label: '400 à 599', start: 400, end: 599, value: 133}, {num: 5, active: '', name: 'range_5', label: '600 à 799', start: 600, end: 799, value: 124}, {num: 6, active: '', name: 'range_6', label: '800 à 999', start: 800, end: 999, value: 115}, {num: 7, active: '', name: 'range_7', label: '1000 à 1199', start: 1000, end: 1199, value: 107}, {num: 8, active: '', name: 'range_8', label: '1200 à 1399', start: 1200, end: 1399, value: 97}, {num: 9, active: '', name: 'range_9', label: '1400 à 1600', start: 1400, end: 1600, value: 89}] }, + {weight: 61, active: '', ranges: [{num: 1, active: '', name: 'range_1', label: '0 à 99', start: 0, end: 99, value: 178}, {num: 2, active: '', name: 'range_2', label: '100 à 249', start: 100, end: 249, value: 163}, {num: 3, active: '', name: 'range_3', label: '250 à 399', start: 250, end: 399, value: 149}, {num: 4, active: '', name: 'range_4', label: '400 à 599', start: 400, end: 599, value: 135}, {num: 5, active: '', name: 'range_5', label: '600 à 799', start: 600, end: 799, value: 126}, {num: 6, active: '', name: 'range_6', label: '800 à 999', start: 800, end: 999, value: 116}, {num: 7, active: '', name: 'range_7', label: '1000 à 1199', start: 1000, end: 1199, value: 108}, {num: 8, active: '', name: 'range_8', label: '1200 à 1399', start: 1200, end: 1399, value: 98}, {num: 9, active: '', name: 'range_9', label: '1400 à 1600', start: 1400, end: 1600, value: 90}] }, + {weight: 62, active: '', ranges: [{num: 1, active: '', name: 'range_1', label: '0 à 99', start: 0, end: 99, value: 180}, {num: 2, active: '', name: 'range_2', label: '100 à 249', start: 100, end: 249, value: 166}, {num: 3, active: '', name: 'range_3', label: '250 à 399', start: 250, end: 399, value: 151}, {num: 4, active: '', name: 'range_4', label: '400 à 599', start: 400, end: 599, value: 137}, {num: 5, active: '', name: 'range_5', label: '600 à 799', start: 600, end: 799, value: 127}, {num: 6, active: '', name: 'range_6', label: '800 à 999', start: 800, end: 999, value: 118}, {num: 7, active: '', name: 'range_7', label: '1000 à 1199', start: 1000, end: 1199, value: 109}, {num: 8, active: '', name: 'range_8', label: '1200 à 1399', start: 1200, end: 1399, value: 99}, {num: 9, active: '', name: 'range_9', label: '1400 à 1600', start: 1400, end: 1600, value: 91}] }, + {weight: 63, active: '', ranges: [{num: 1, active: '', name: 'range_1', label: '0 à 99', start: 0, end: 99, value: 183}, {num: 2, active: '', name: 'range_2', label: '100 à 249', start: 100, end: 249, value: 168}, {num: 3, active: '', name: 'range_3', label: '250 à 399', start: 250, end: 399, value: 153}, {num: 4, active: '', name: 'range_4', label: '400 à 599', start: 400, end: 599, value: 138}, {num: 5, active: '', name: 'range_5', label: '600 à 799', start: 600, end: 799, value: 129}, {num: 6, active: '', name: 'range_6', label: '800 à 999', start: 800, end: 999, value: 119}, {num: 7, active: '', name: 'range_7', label: '1000 à 1199', start: 1000, end: 1199, value: 111}, {num: 8, active: '', name: 'range_8', label: '1200 à 1399', start: 1200, end: 1399, value: 100}, {num: 9, active: '', name: 'range_9', label: '1400 à 1600', start: 1400, end: 1600, value: 91}] }, + {weight: 64, active: '', ranges: [{num: 1, active: '', name: 'range_1', label: '0 à 99', start: 0, end: 99, value: 185}, {num: 2, active: '', name: 'range_2', label: '100 à 249', start: 100, end: 249, value: 170}, {num: 3, active: '', name: 'range_3', label: '250 à 399', start: 250, end: 399, value: 155}, {num: 4, active: '', name: 'range_4', label: '400 à 599', start: 400, end: 599, value: 140}, {num: 5, active: '', name: 'range_5', label: '600 à 799', start: 600, end: 799, value: 130}, {num: 6, active: '', name: 'range_6', label: '800 à 999', start: 800, end: 999, value: 121}, {num: 7, active: '', name: 'range_7', label: '1000 à 1199', start: 1000, end: 1199, value: 112}, {num: 8, active: '', name: 'range_8', label: '1200 à 1399', start: 1200, end: 1399, value: 101}, {num: 9, active: '', name: 'range_9', label: '1400 à 1600', start: 1400, end: 1600, value: 92}] }, + {weight: 65, active: '', ranges: [{num: 1, active: '', name: 'range_1', label: '0 à 99', start: 0, end: 99, value: 188}, {num: 2, active: '', name: 'range_2', label: '100 à 249', start: 100, end: 249, value: 173}, {num: 3, active: '', name: 'range_3', label: '250 à 399', start: 250, end: 399, value: 157}, {num: 4, active: '', name: 'range_4', label: '400 à 599', start: 400, end: 599, value: 142}, {num: 5, active: '', name: 'range_5', label: '600 à 799', start: 600, end: 799, value: 132}, {num: 6, active: '', name: 'range_6', label: '800 à 999', start: 800, end: 999, value: 122}, {num: 7, active: '', name: 'range_7', label: '1000 à 1199', start: 1000, end: 1199, value: 113}, {num: 8, active: '', name: 'range_8', label: '1200 à 1399', start: 1200, end: 1399, value: 102}, {num: 9, active: '', name: 'range_9', label: '1400 à 1600', start: 1400, end: 1600, value: 93}] }, + {weight: 66, active: '', ranges: [{num: 1, active: '', name: 'range_1', label: '0 à 99', start: 0, end: 99, value: 190}, {num: 2, active: '', name: 'range_2', label: '100 à 249', start: 100, end: 249, value: 175}, {num: 3, active: '', name: 'range_3', label: '250 à 399', start: 250, end: 399, value: 159}, {num: 4, active: '', name: 'range_4', label: '400 à 599', start: 400, end: 599, value: 144}, {num: 5, active: '', name: 'range_5', label: '600 à 799', start: 600, end: 799, value: 134}, {num: 6, active: '', name: 'range_6', label: '800 à 999', start: 800, end: 999, value: 123}, {num: 7, active: '', name: 'range_7', label: '1000 à 1199', start: 1000, end: 1199, value: 114}, {num: 8, active: '', name: 'range_8', label: '1200 à 1399', start: 1200, end: 1399, value: 103}, {num: 9, active: '', name: 'range_9', label: '1400 à 1600', start: 1400, end: 1600, value: 94}] }, + {weight: 67, active: '', ranges: [{num: 1, active: '', name: 'range_1', label: '0 à 99', start: 0, end: 99, value: 193}, {num: 2, active: '', name: 'range_2', label: '100 à 249', start: 100, end: 249, value: 177}, {num: 3, active: '', name: 'range_3', label: '250 à 399', start: 250, end: 399, value: 161}, {num: 4, active: '', name: 'range_4', label: '400 à 599', start: 400, end: 599, value: 146}, {num: 5, active: '', name: 'range_5', label: '600 à 799', start: 600, end: 799, value: 135}, {num: 6, active: '', name: 'range_6', label: '800 à 999', start: 800, end: 999, value: 125}, {num: 7, active: '', name: 'range_7', label: '1000 à 1199', start: 1000, end: 1199, value: 116}, {num: 8, active: '', name: 'range_8', label: '1200 à 1399', start: 1200, end: 1399, value: 104}, {num: 9, active: '', name: 'range_9', label: '1400 à 1600', start: 1400, end: 1600, value: 94}] }, + {weight: 68, active: '', ranges: [{num: 1, active: '', name: 'range_1', label: '0 à 99', start: 0, end: 99, value: 195}, {num: 2, active: '', name: 'range_2', label: '100 à 249', start: 100, end: 249, value: 179}, {num: 3, active: '', name: 'range_3', label: '250 à 399', start: 250, end: 399, value: 164}, {num: 4, active: '', name: 'range_4', label: '400 à 599', start: 400, end: 599, value: 147}, {num: 5, active: '', name: 'range_5', label: '600 à 799', start: 600, end: 799, value: 137}, {num: 6, active: '', name: 'range_6', label: '800 à 999', start: 800, end: 999, value: 126}, {num: 7, active: '', name: 'range_7', label: '1000 à 1199', start: 1000, end: 1199, value: 117}, {num: 8, active: '', name: 'range_8', label: '1200 à 1399', start: 1200, end: 1399, value: 105}, {num: 9, active: '', name: 'range_9', label: '1400 à 1600', start: 1400, end: 1600, value: 95}] }, + {weight: 69, active: '', ranges: [{num: 1, active: '', name: 'range_1', label: '0 à 99', start: 0, end: 99, value: 198}, {num: 2, active: '', name: 'range_2', label: '100 à 249', start: 100, end: 249, value: 182}, {num: 3, active: '', name: 'range_3', label: '250 à 399', start: 250, end: 399, value: 166}, {num: 4, active: '', name: 'range_4', label: '400 à 599', start: 400, end: 599, value: 149}, {num: 5, active: '', name: 'range_5', label: '600 à 799', start: 600, end: 799, value: 138}, {num: 6, active: '', name: 'range_6', label: '800 à 999', start: 800, end: 999, value: 128}, {num: 7, active: '', name: 'range_7', label: '1000 à 1199', start: 1000, end: 1199, value: 118}, {num: 8, active: '', name: 'range_8', label: '1200 à 1399', start: 1200, end: 1399, value: 106}, {num: 9, active: '', name: 'range_9', label: '1400 à 1600', start: 1400, end: 1600, value: 96}] }, + {weight: 70, active: '', ranges: [{num: 1, active: '', name: 'range_1', label: '0 à 99', start: 0, end: 99, value: 200}, {num: 2, active: '', name: 'range_2', label: '100 à 249', start: 100, end: 249, value: 184}, {num: 3, active: '', name: 'range_3', label: '250 à 399', start: 250, end: 399, value: 168}, {num: 4, active: '', name: 'range_4', label: '400 à 599', start: 400, end: 599, value: 151}, {num: 5, active: '', name: 'range_5', label: '600 à 799', start: 600, end: 799, value: 140}, {num: 6, active: '', name: 'range_6', label: '800 à 999', start: 800, end: 999, value: 129}, {num: 7, active: '', name: 'range_7', label: '1000 à 1199', start: 1000, end: 1199, value: 119}, {num: 8, active: '', name: 'range_8', label: '1200 à 1399', start: 1200, end: 1399, value: 107}, {num: 9, active: '', name: 'range_9', label: '1400 à 1600', start: 1400, end: 1600, value: 96}] }, + {weight: 71, active: '', ranges: [{num: 1, active: '', name: 'range_1', label: '0 à 99', start: 0, end: 99, value: 203}, {num: 2, active: '', name: 'range_2', label: '100 à 249', start: 100, end: 249, value: 186}, {num: 3, active: '', name: 'range_3', label: '250 à 399', start: 250, end: 399, value: 170}, {num: 4, active: '', name: 'range_4', label: '400 à 599', start: 400, end: 599, value: 153}, {num: 5, active: '', name: 'range_5', label: '600 à 799', start: 600, end: 799, value: 142}, {num: 6, active: '', name: 'range_6', label: '800 à 999', start: 800, end: 999, value: 130}, {num: 7, active: '', name: 'range_7', label: '1000 à 1199', start: 1000, end: 1199, value: 120}, {num: 8, active: '', name: 'range_8', label: '1200 à 1399', start: 1200, end: 1399, value: 107}, {num: 9, active: '', name: 'range_9', label: '1400 à 1600', start: 1400, end: 1600, value: 97}] }, + {weight: 72, active: '', ranges: [{num: 1, active: '', name: 'range_1', label: '0 à 99', start: 0, end: 99, value: 205}, {num: 2, active: '', name: 'range_2', label: '100 à 249', start: 100, end: 249, value: 189}, {num: 3, active: '', name: 'range_3', label: '250 à 399', start: 250, end: 399, value: 172}, {num: 4, active: '', name: 'range_4', label: '400 à 599', start: 400, end: 599, value: 155}, {num: 5, active: '', name: 'range_5', label: '600 à 799', start: 600, end: 799, value: 143}, {num: 6, active: '', name: 'range_6', label: '800 à 999', start: 800, end: 999, value: 132}, {num: 7, active: '', name: 'range_7', label: '1000 à 1199', start: 1000, end: 1199, value: 121}, {num: 8, active: '', name: 'range_8', label: '1200 à 1399', start: 1200, end: 1399, value: 108}, {num: 9, active: '', name: 'range_9', label: '1400 à 1600', start: 1400, end: 1600, value: 98}] }, + {weight: 73, active: '', ranges: [{num: 1, active: '', name: 'range_1', label: '0 à 99', start: 0, end: 99, value: 208}, {num: 2, active: '', name: 'range_2', label: '100 à 249', start: 100, end: 249, value: 191}, {num: 3, active: '', name: 'range_3', label: '250 à 399', start: 250, end: 399, value: 174}, {num: 4, active: '', name: 'range_4', label: '400 à 599', start: 400, end: 599, value: 156}, {num: 5, active: '', name: 'range_5', label: '600 à 799', start: 600, end: 799, value: 145}, {num: 6, active: '', name: 'range_6', label: '800 à 999', start: 800, end: 999, value: 133}, {num: 7, active: '', name: 'range_7', label: '1000 à 1199', start: 1000, end: 1199, value: 123}, {num: 8, active: '', name: 'range_8', label: '1200 à 1399', start: 1200, end: 1399, value: 109}, {num: 9, active: '', name: 'range_9', label: '1400 à 1600', start: 1400, end: 1600, value: 99}] }, + {weight: 74, active: '', ranges: [{num: 1, active: '', name: 'range_1', label: '0 à 99', start: 0, end: 99, value: 210}, {num: 2, active: '', name: 'range_2', label: '100 à 249', start: 100, end: 249, value: 193}, {num: 3, active: '', name: 'range_3', label: '250 à 399', start: 250, end: 399, value: 176}, {num: 4, active: '', name: 'range_4', label: '400 à 599', start: 400, end: 599, value: 158}, {num: 5, active: '', name: 'range_5', label: '600 à 799', start: 600, end: 799, value: 146}, {num: 6, active: '', name: 'range_6', label: '800 à 999', start: 800, end: 999, value: 134}, {num: 7, active: '', name: 'range_7', label: '1000 à 1199', start: 1000, end: 1199, value: 124}, {num: 8, active: '', name: 'range_8', label: '1200 à 1399', start: 1200, end: 1399, value: 110}, {num: 9, active: '', name: 'range_9', label: '1400 à 1600', start: 1400, end: 1600, value: 99}] }, + {weight: 75, active: '', ranges: [{num: 1, active: '', name: 'range_1', label: '0 à 99', start: 0, end: 99, value: 213}, {num: 2, active: '', name: 'range_2', label: '100 à 249', start: 100, end: 249, value: 196}, {num: 3, active: '', name: 'range_3', label: '250 à 399', start: 250, end: 399, value: 178}, {num: 4, active: '', name: 'range_4', label: '400 à 599', start: 400, end: 599, value: 160}, {num: 5, active: '', name: 'range_5', label: '600 à 799', start: 600, end: 799, value: 148}, {num: 6, active: '', name: 'range_6', label: '800 à 999', start: 800, end: 999, value: 136}, {num: 7, active: '', name: 'range_7', label: '1000 à 1199', start: 1000, end: 1199, value: 125}, {num: 8, active: '', name: 'range_8', label: '1200 à 1399', start: 1200, end: 1399, value: 111}, {num: 9, active: '', name: 'range_9', label: '1400 à 1600', start: 1400, end: 1600, value: 100}] }, + {weight: 76, active: '', ranges: [{num: 1, active: '', name: 'range_1', label: '0 à 99', start: 0, end: 99, value: 215}, {num: 2, active: '', name: 'range_2', label: '100 à 249', start: 100, end: 249, value: 198}, {num: 3, active: '', name: 'range_3', label: '250 à 399', start: 250, end: 399, value: 180}, {num: 4, active: '', name: 'range_4', label: '400 à 599', start: 400, end: 599, value: 162}, {num: 5, active: '', name: 'range_5', label: '600 à 799', start: 600, end: 799, value: 150}, {num: 6, active: '', name: 'range_6', label: '800 à 999', start: 800, end: 999, value: 137}, {num: 7, active: '', name: 'range_7', label: '1000 à 1199', start: 1000, end: 1199, value: 126}, {num: 8, active: '', name: 'range_8', label: '1200 à 1399', start: 1200, end: 1399, value: 112}, {num: 9, active: '', name: 'range_9', label: '1400 à 1600', start: 1400, end: 1600, value: 101}] }, + {weight: 77, active: '', ranges: [{num: 1, active: '', name: 'range_1', label: '0 à 99', start: 0, end: 99, value: 218}, {num: 2, active: '', name: 'range_2', label: '100 à 249', start: 100, end: 249, value: 200}, {num: 3, active: '', name: 'range_3', label: '250 à 399', start: 250, end: 399, value: 182}, {num: 4, active: '', name: 'range_4', label: '400 à 599', start: 400, end: 599, value: 163}, {num: 5, active: '', name: 'range_5', label: '600 à 799', start: 600, end: 799, value: 151}, {num: 6, active: '', name: 'range_6', label: '800 à 999', start: 800, end: 999, value: 139}, {num: 7, active: '', name: 'range_7', label: '1000 à 1199', start: 1000, end: 1199, value: 127}, {num: 8, active: '', name: 'range_8', label: '1200 à 1399', start: 1200, end: 1399, value: 113}, {num: 9, active: '', name: 'range_9', label: '1400 à 1600', start: 1400, end: 1600, value: 101}] }, + {weight: 78, active: '', ranges: [{num: 1, active: '', name: 'range_1', label: '0 à 99', start: 0, end: 99, value: 220}, {num: 2, active: '', name: 'range_2', label: '100 à 249', start: 100, end: 249, value: 202}, {num: 3, active: '', name: 'range_3', label: '250 à 399', start: 250, end: 399, value: 184}, {num: 4, active: '', name: 'range_4', label: '400 à 599', start: 400, end: 599, value: 165}, {num: 5, active: '', name: 'range_5', label: '600 à 799', start: 600, end: 799, value: 153}, {num: 6, active: '', name: 'range_6', label: '800 à 999', start: 800, end: 999, value: 140}, {num: 7, active: '', name: 'range_7', label: '1000 à 1199', start: 1000, end: 1199, value: 128}, {num: 8, active: '', name: 'range_8', label: '1200 à 1399', start: 1200, end: 1399, value: 114}, {num: 9, active: '', name: 'range_9', label: '1400 à 1600', start: 1400, end: 1600, value: 102}] }, + {weight: 79, active: '', ranges: [{num: 1, active: '', name: 'range_1', label: '0 à 99', start: 0, end: 99, value: 223}, {num: 2, active: '', name: 'range_2', label: '100 à 249', start: 100, end: 249, value: 205}, {num: 3, active: '', name: 'range_3', label: '250 à 399', start: 250, end: 399, value: 186}, {num: 4, active: '', name: 'range_4', label: '400 à 599', start: 400, end: 599, value: 167}, {num: 5, active: '', name: 'range_5', label: '600 à 799', start: 600, end: 799, value: 154}, {num: 6, active: '', name: 'range_6', label: '800 à 999', start: 800, end: 999, value: 141}, {num: 7, active: '', name: 'range_7', label: '1000 à 1199', start: 1000, end: 1199, value: 129}, {num: 8, active: '', name: 'range_8', label: '1200 à 1399', start: 1200, end: 1399, value: 115}, {num: 9, active: '', name: 'range_9', label: '1400 à 1600', start: 1400, end: 1600, value: 103}] }, + {weight: 80, active: '', ranges: [{num: 1, active: '', name: 'range_1', label: '0 à 99', start: 0, end: 99, value: 225}, {num: 2, active: '', name: 'range_2', label: '100 à 249', start: 100, end: 249, value: 207}, {num: 3, active: '', name: 'range_3', label: '250 à 399', start: 250, end: 399, value: 188}, {num: 4, active: '', name: 'range_4', label: '400 à 599', start: 400, end: 599, value: 169}, {num: 5, active: '', name: 'range_5', label: '600 à 799', start: 600, end: 799, value: 156}, {num: 6, active: '', name: 'range_6', label: '800 à 999', start: 800, end: 999, value: 143}, {num: 7, active: '', name: 'range_7', label: '1000 à 1199', start: 1000, end: 1199, value: 131}, {num: 8, active: '', name: 'range_8', label: '1200 à 1399', start: 1200, end: 1399, value: 115}, {num: 9, active: '', name: 'range_9', label: '1400 à 1600', start: 1400, end: 1600, value: 103}] }, + {weight: 81, active: '', ranges: [{num: 1, active: '', name: 'range_1', label: '0 à 99', start: 0, end: 99, value: 228}, {num: 2, active: '', name: 'range_2', label: '100 à 249', start: 100, end: 249, value: 209}, {num: 3, active: '', name: 'range_3', label: '250 à 399', start: 250, end: 399, value: 190}, {num: 4, active: '', name: 'range_4', label: '400 à 599', start: 400, end: 599, value: 170}, {num: 5, active: '', name: 'range_5', label: '600 à 799', start: 600, end: 799, value: 157}, {num: 6, active: '', name: 'range_6', label: '800 à 999', start: 800, end: 999, value: 144}, {num: 7, active: '', name: 'range_7', label: '1000 à 1199', start: 1000, end: 1199, value: 132}, {num: 8, active: '', name: 'range_8', label: '1200 à 1399', start: 1200, end: 1399, value: 116}, {num: 9, active: '', name: 'range_9', label: '1400 à 1600', start: 1400, end: 1600, value: 104}] }, + {weight: 82, active: '', ranges: [{num: 1, active: '', name: 'range_1', label: '0 à 99', start: 0, end: 99, value: 230}, {num: 2, active: '', name: 'range_2', label: '100 à 249', start: 100, end: 249, value: 212}, {num: 3, active: '', name: 'range_3', label: '250 à 399', start: 250, end: 399, value: 192}, {num: 4, active: '', name: 'range_4', label: '400 à 599', start: 400, end: 599, value: 172}, {num: 5, active: '', name: 'range_5', label: '600 à 799', start: 600, end: 799, value: 159}, {num: 6, active: '', name: 'range_6', label: '800 à 999', start: 800, end: 999, value: 145}, {num: 7, active: '', name: 'range_7', label: '1000 à 1199', start: 1000, end: 1199, value: 133}, {num: 8, active: '', name: 'range_8', label: '1200 à 1399', start: 1200, end: 1399, value: 117}, {num: 9, active: '', name: 'range_9', label: '1400 à 1600', start: 1400, end: 1600, value: 104}] }, + {weight: 83, active: '', ranges: [{num: 1, active: '', name: 'range_1', label: '0 à 99', start: 0, end: 99, value: 233}, {num: 2, active: '', name: 'range_2', label: '100 à 249', start: 100, end: 249, value: 214}, {num: 3, active: '', name: 'range_3', label: '250 à 399', start: 250, end: 399, value: 194}, {num: 4, active: '', name: 'range_4', label: '400 à 599', start: 400, end: 599, value: 174}, {num: 5, active: '', name: 'range_5', label: '600 à 799', start: 600, end: 799, value: 160}, {num: 6, active: '', name: 'range_6', label: '800 à 999', start: 800, end: 999, value: 146}, {num: 7, active: '', name: 'range_7', label: '1000 à 1199', start: 1000, end: 1199, value: 134}, {num: 8, active: '', name: 'range_8', label: '1200 à 1399', start: 1200, end: 1399, value: 118}, {num: 9, active: '', name: 'range_9', label: '1400 à 1600', start: 1400, end: 1600, value: 105}] }, + {weight: 84, active: '', ranges: [{num: 1, active: '', name: 'range_1', label: '0 à 99', start: 0, end: 99, value: 235}, {num: 2, active: '', name: 'range_2', label: '100 à 249', start: 100, end: 249, value: 216}, {num: 3, active: '', name: 'range_3', label: '250 à 399', start: 250, end: 399, value: 196}, {num: 4, active: '', name: 'range_4', label: '400 à 599', start: 400, end: 599, value: 176}, {num: 5, active: '', name: 'range_5', label: '600 à 799', start: 600, end: 799, value: 162}, {num: 6, active: '', name: 'range_6', label: '800 à 999', start: 800, end: 999, value: 148}, {num: 7, active: '', name: 'range_7', label: '1000 à 1199', start: 1000, end: 1199, value: 135}, {num: 8, active: '', name: 'range_8', label: '1200 à 1399', start: 1200, end: 1399, value: 119}, {num: 9, active: '', name: 'range_9', label: '1400 à 1600', start: 1400, end: 1600, value: 106}] }, + {weight: 85, active: '', ranges: [{num: 1, active: '', name: 'range_1', label: '0 à 99', start: 0, end: 99, value: 238}, {num: 2, active: '', name: 'range_2', label: '100 à 249', start: 100, end: 249, value: 219}, {num: 3, active: '', name: 'range_3', label: '250 à 399', start: 250, end: 399, value: 198}, {num: 4, active: '', name: 'range_4', label: '400 à 599', start: 400, end: 599, value: 177}, {num: 5, active: '', name: 'range_5', label: '600 à 799', start: 600, end: 799, value: 163}, {num: 6, active: '', name: 'range_6', label: '800 à 999', start: 800, end: 999, value: 149}, {num: 7, active: '', name: 'range_7', label: '1000 à 1199', start: 1000, end: 1199, value: 136}, {num: 8, active: '', name: 'range_8', label: '1200 à 1399', start: 1200, end: 1399, value: 120}, {num: 9, active: '', name: 'range_9', label: '1400 à 1600', start: 1400, end: 1600, value: 106}] }, + {weight: 86, active: '', ranges: [{num: 1, active: '', name: 'range_1', label: '0 à 99', start: 0, end: 99, value: 240}, {num: 2, active: '', name: 'range_2', label: '100 à 249', start: 100, end: 249, value: 221}, {num: 3, active: '', name: 'range_3', label: '250 à 399', start: 250, end: 399, value: 201}, {num: 4, active: '', name: 'range_4', label: '400 à 599', start: 400, end: 599, value: 179}, {num: 5, active: '', name: 'range_5', label: '600 à 799', start: 600, end: 799, value: 165}, {num: 6, active: '', name: 'range_6', label: '800 à 999', start: 800, end: 999, value: 150}, {num: 7, active: '', name: 'range_7', label: '1000 à 1199', start: 1000, end: 1199, value: 137}, {num: 8, active: '', name: 'range_8', label: '1200 à 1399', start: 1200, end: 1399, value: 120}, {num: 9, active: '', name: 'range_9', label: '1400 à 1600', start: 1400, end: 1600, value: 107}] }, + {weight: 87, active: '', ranges: [{num: 1, active: '', name: 'range_1', label: '0 à 99', start: 0, end: 99, value: 243}, {num: 2, active: '', name: 'range_2', label: '100 à 249', start: 100, end: 249, value: 223}, {num: 3, active: '', name: 'range_3', label: '250 à 399', start: 250, end: 399, value: 203}, {num: 4, active: '', name: 'range_4', label: '400 à 599', start: 400, end: 599, value: 181}, {num: 5, active: '', name: 'range_5', label: '600 à 799', start: 600, end: 799, value: 166}, {num: 6, active: '', name: 'range_6', label: '800 à 999', start: 800, end: 999, value: 152}, {num: 7, active: '', name: 'range_7', label: '1000 à 1199', start: 1000, end: 1199, value: 138}, {num: 8, active: '', name: 'range_8', label: '1200 à 1399', start: 1200, end: 1399, value: 121}, {num: 9, active: '', name: 'range_9', label: '1400 à 1600', start: 1400, end: 1600, value: 108}] }, + {weight: 88, active: '', ranges: [{num: 1, active: '', name: 'range_1', label: '0 à 99', start: 0, end: 99, value: 245}, {num: 2, active: '', name: 'range_2', label: '100 à 249', start: 100, end: 249, value: 225}, {num: 3, active: '', name: 'range_3', label: '250 à 399', start: 250, end: 399, value: 205}, {num: 4, active: '', name: 'range_4', label: '400 à 599', start: 400, end: 599, value: 183}, {num: 5, active: '', name: 'range_5', label: '600 à 799', start: 600, end: 799, value: 168}, {num: 6, active: '', name: 'range_6', label: '800 à 999', start: 800, end: 999, value: 153}, {num: 7, active: '', name: 'range_7', label: '1000 à 1199', start: 1000, end: 1199, value: 139}, {num: 8, active: '', name: 'range_8', label: '1200 à 1399', start: 1200, end: 1399, value: 122}, {num: 9, active: '', name: 'range_9', label: '1400 à 1600', start: 1400, end: 1600, value: 108}] }, + {weight: 89, active: '', ranges: [{num: 1, active: '', name: 'range_1', label: '0 à 99', start: 0, end: 99, value: 248}, {num: 2, active: '', name: 'range_2', label: '100 à 249', start: 100, end: 249, value: 228}, {num: 3, active: '', name: 'range_3', label: '250 à 399', start: 250, end: 399, value: 207}, {num: 4, active: '', name: 'range_4', label: '400 à 599', start: 400, end: 599, value: 184}, {num: 5, active: '', name: 'range_5', label: '600 à 799', start: 600, end: 799, value: 170}, {num: 6, active: '', name: 'range_6', label: '800 à 999', start: 800, end: 999, value: 154}, {num: 7, active: '', name: 'range_7', label: '1000 à 1199', start: 1000, end: 1199, value: 140}, {num: 8, active: '', name: 'range_8', label: '1200 à 1399', start: 1200, end: 1399, value: 123}, {num: 9, active: '', name: 'range_9', label: '1400 à 1600', start: 1400, end: 1600, value: 109}] }, + {weight: 90, active: '', ranges: [{num: 1, active: '', name: 'range_1', label: '0 à 99', start: 0, end: 99, value: 250}, {num: 2, active: '', name: 'range_2', label: '100 à 249', start: 100, end: 249, value: 230}, {num: 3, active: '', name: 'range_3', label: '250 à 399', start: 250, end: 399, value: 209}, {num: 4, active: '', name: 'range_4', label: '400 à 599', start: 400, end: 599, value: 186}, {num: 5, active: '', name: 'range_5', label: '600 à 799', start: 600, end: 799, value: 171}, {num: 6, active: '', name: 'range_6', label: '800 à 999', start: 800, end: 999, value: 156}, {num: 7, active: '', name: 'range_7', label: '1000 à 1199', start: 1000, end: 1199, value: 141}, {num: 8, active: '', name: 'range_8', label: '1200 à 1399', start: 1200, end: 1399, value: 124}, {num: 9, active: '', name: 'range_9', label: '1400 à 1600', start: 1400, end: 1600, value: 109}] }, + {weight: 91, active: '', ranges: [{num: 1, active: '', name: 'range_1', label: '0 à 99', start: 0, end: 99, value: 253}, {num: 2, active: '', name: 'range_2', label: '100 à 249', start: 100, end: 249, value: 232}, {num: 3, active: '', name: 'range_3', label: '250 à 399', start: 250, end: 399, value: 211}, {num: 4, active: '', name: 'range_4', label: '400 à 599', start: 400, end: 599, value: 188}, {num: 5, active: '', name: 'range_5', label: '600 à 799', start: 600, end: 799, value: 173}, {num: 6, active: '', name: 'range_6', label: '800 à 999', start: 800, end: 999, value: 157}, {num: 7, active: '', name: 'range_7', label: '1000 à 1199', start: 1000, end: 1199, value: 143}, {num: 8, active: '', name: 'range_8', label: '1200 à 1399', start: 1200, end: 1399, value: 124}, {num: 9, active: '', name: 'range_9', label: '1400 à 1600', start: 1400, end: 1600, value: 110}] }, + {weight: 92, active: '', ranges: [{num: 1, active: '', name: 'range_1', label: '0 à 99', start: 0, end: 99, value: 255}, {num: 2, active: '', name: 'range_2', label: '100 à 249', start: 100, end: 249, value: 235}, {num: 3, active: '', name: 'range_3', label: '250 à 399', start: 250, end: 399, value: 213}, {num: 4, active: '', name: 'range_4', label: '400 à 599', start: 400, end: 599, value: 190}, {num: 5, active: '', name: 'range_5', label: '600 à 799', start: 600, end: 799, value: 174}, {num: 6, active: '', name: 'range_6', label: '800 à 999', start: 800, end: 999, value: 158}, {num: 7, active: '', name: 'range_7', label: '1000 à 1199', start: 1000, end: 1199, value: 144}, {num: 8, active: '', name: 'range_8', label: '1200 à 1399', start: 1200, end: 1399, value: 125}, {num: 9, active: '', name: 'range_9', label: '1400 à 1600', start: 1400, end: 1600, value: 110}] }, + {weight: 93, active: '', ranges: [{num: 1, active: '', name: 'range_1', label: '0 à 99', start: 0, end: 99, value: 258}, {num: 2, active: '', name: 'range_2', label: '100 à 249', start: 100, end: 249, value: 237}, {num: 3, active: '', name: 'range_3', label: '250 à 399', start: 250, end: 399, value: 215}, {num: 4, active: '', name: 'range_4', label: '400 à 599', start: 400, end: 599, value: 191}, {num: 5, active: '', name: 'range_5', label: '600 à 799', start: 600, end: 799, value: 176}, {num: 6, active: '', name: 'range_6', label: '800 à 999', start: 800, end: 999, value: 159}, {num: 7, active: '', name: 'range_7', label: '1000 à 1199', start: 1000, end: 1199, value: 145}, {num: 8, active: '', name: 'range_8', label: '1200 à 1399', start: 1200, end: 1399, value: 126}, {num: 9, active: '', name: 'range_9', label: '1400 à 1600', start: 1400, end: 1600, value: 111}] }, + {weight: 94, active: '', ranges: [{num: 1, active: '', name: 'range_1', label: '0 à 99', start: 0, end: 99, value: 260}, {num: 2, active: '', name: 'range_2', label: '100 à 249', start: 100, end: 249, value: 239}, {num: 3, active: '', name: 'range_3', label: '250 à 399', start: 250, end: 399, value: 217}, {num: 4, active: '', name: 'range_4', label: '400 à 599', start: 400, end: 599, value: 193}, {num: 5, active: '', name: 'range_5', label: '600 à 799', start: 600, end: 799, value: 177}, {num: 6, active: '', name: 'range_6', label: '800 à 999', start: 800, end: 999, value: 161}, {num: 7, active: '', name: 'range_7', label: '1000 à 1199', start: 1000, end: 1199, value: 146}, {num: 8, active: '', name: 'range_8', label: '1200 à 1399', start: 1200, end: 1399, value: 127}, {num: 9, active: '', name: 'range_9', label: '1400 à 1600', start: 1400, end: 1600, value: 112}] }, + {weight: 95, active: '', ranges: [{num: 1, active: '', name: 'range_1', label: '0 à 99', start: 0, end: 99, value: 263}, {num: 2, active: '', name: 'range_2', label: '100 à 249', start: 100, end: 249, value: 242}, {num: 3, active: '', name: 'range_3', label: '250 à 399', start: 250, end: 399, value: 219}, {num: 4, active: '', name: 'range_4', label: '400 à 599', start: 400, end: 599, value: 195}, {num: 5, active: '', name: 'range_5', label: '600 à 799', start: 600, end: 799, value: 179}, {num: 6, active: '', name: 'range_6', label: '800 à 999', start: 800, end: 999, value: 162}, {num: 7, active: '', name: 'range_7', label: '1000 à 1199', start: 1000, end: 1199, value: 147}, {num: 8, active: '', name: 'range_8', label: '1200 à 1399', start: 1200, end: 1399, value: 128}, {num: 9, active: '', name: 'range_9', label: '1400 à 1600', start: 1400, end: 1600, value: 112}] }, + {weight: 96, active: '', ranges: [{num: 1, active: '', name: 'range_1', label: '0 à 99', start: 0, end: 99, value: 265}, {num: 2, active: '', name: 'range_2', label: '100 à 249', start: 100, end: 249, value: 244}, {num: 3, active: '', name: 'range_3', label: '250 à 399', start: 250, end: 399, value: 221}, {num: 4, active: '', name: 'range_4', label: '400 à 599', start: 400, end: 599, value: 197}, {num: 5, active: '', name: 'range_5', label: '600 à 799', start: 600, end: 799, value: 180}, {num: 6, active: '', name: 'range_6', label: '800 à 999', start: 800, end: 999, value: 163}, {num: 7, active: '', name: 'range_7', label: '1000 à 1199', start: 1000, end: 1199, value: 148}, {num: 8, active: '', name: 'range_8', label: '1200 à 1399', start: 1200, end: 1399, value: 128}, {num: 9, active: '', name: 'range_9', label: '1400 à 1600', start: 1400, end: 1600, value: 113}] }, + {weight: 97, active: '', ranges: [{num: 1, active: '', name: 'range_1', label: '0 à 99', start: 0, end: 99, value: 268}, {num: 2, active: '', name: 'range_2', label: '100 à 249', start: 100, end: 249, value: 246}, {num: 3, active: '', name: 'range_3', label: '250 à 399', start: 250, end: 399, value: 223}, {num: 4, active: '', name: 'range_4', label: '400 à 599', start: 400, end: 599, value: 198}, {num: 5, active: '', name: 'range_5', label: '600 à 799', start: 600, end: 799, value: 182}, {num: 6, active: '', name: 'range_6', label: '800 à 999', start: 800, end: 999, value: 164}, {num: 7, active: '', name: 'range_7', label: '1000 à 1199', start: 1000, end: 1199, value: 149}, {num: 8, active: '', name: 'range_8', label: '1200 à 1399', start: 1200, end: 1399, value: 129}, {num: 9, active: '', name: 'range_9', label: '1400 à 1600', start: 1400, end: 1600, value: 113}] }, + {weight: 98, active: '', ranges: [{num: 1, active: '', name: 'range_1', label: '0 à 99', start: 0, end: 99, value: 270}, {num: 2, active: '', name: 'range_2', label: '100 à 249', start: 100, end: 249, value: 248}, {num: 3, active: '', name: 'range_3', label: '250 à 399', start: 250, end: 399, value: 225}, {num: 4, active: '', name: 'range_4', label: '400 à 599', start: 400, end: 599, value: 200}, {num: 5, active: '', name: 'range_5', label: '600 à 799', start: 600, end: 799, value: 183}, {num: 6, active: '', name: 'range_6', label: '800 à 999', start: 800, end: 999, value: 166}, {num: 7, active: '', name: 'range_7', label: '1000 à 1199', start: 1000, end: 1199, value: 150}, {num: 8, active: '', name: 'range_8', label: '1200 à 1399', start: 1200, end: 1399, value: 130}, {num: 9, active: '', name: 'range_9', label: '1400 à 1600', start: 1400, end: 1600, value: 114}] }, + {weight: 99, active: '', ranges: [{num: 1, active: '', name: 'range_1', label: '0 à 99', start: 0, end: 99, value: 273}, {num: 2, active: '', name: 'range_2', label: '100 à 249', start: 100, end: 249, value: 251}, {num: 3, active: '', name: 'range_3', label: '250 à 399', start: 250, end: 399, value: 227}, {num: 4, active: '', name: 'range_4', label: '400 à 599', start: 400, end: 599, value: 202}, {num: 5, active: '', name: 'range_5', label: '600 à 799', start: 600, end: 799, value: 185}, {num: 6, active: '', name: 'range_6', label: '800 à 999', start: 800, end: 999, value: 167}, {num: 7, active: '', name: 'range_7', label: '1000 à 1199', start: 1000, end: 1199, value: 151}, {num: 8, active: '', name: 'range_8', label: '1200 à 1399', start: 1200, end: 1399, value: 131}, {num: 9, active: '', name: 'range_9', label: '1400 à 1600', start: 1400, end: 1600, value: 114}] }, + {weight: 100, active: '', ranges: [{num: 1, active: '', name: 'range_1', label: '0 à 99', start: 0, end: 99, value: 275}, {num: 2, active: '', name: 'range_2', label: '100 à 249', start: 100, end: 249, value: 253}, {num: 3, active: '', name: 'range_3', label: '250 à 399', start: 250, end: 399, value: 229}, {num: 4, active: '', name: 'range_4', label: '400 à 599', start: 400, end: 599, value: 203}, {num: 5, active: '', name: 'range_5', label: '600 à 799', start: 600, end: 799, value: 186}, {num: 6, active: '', name: 'range_6', label: '800 à 999', start: 800, end: 999, value: 168}, {num: 7, active: '', name: 'range_7', label: '1000 à 1199', start: 1000, end: 1199, value: 152}, {num: 8, active: '', name: 'range_8', label: '1200 à 1399', start: 1200, end: 1399, value: 131}, {num: 9, active: '', name: 'range_9', label: '1400 à 1600', start: 1400, end: 1600, value: 115}] }, + {weight: 101, active: '', ranges: [{num: 1, active: '', name: 'range_1', label: '0 à 99', start: 0, end: 99, value: 278}, {num: 2, active: '', name: 'range_2', label: '100 à 249', start: 100, end: 249, value: 255}, {num: 3, active: '', name: 'range_3', label: '250 à 399', start: 250, end: 399, value: 231}, {num: 4, active: '', name: 'range_4', label: '400 à 599', start: 400, end: 599, value: 205}, {num: 5, active: '', name: 'range_5', label: '600 à 799', start: 600, end: 799, value: 188}, {num: 6, active: '', name: 'range_6', label: '800 à 999', start: 800, end: 999, value: 169}, {num: 7, active: '', name: 'range_7', label: '1000 à 1199', start: 1000, end: 1199, value: 153}, {num: 8, active: '', name: 'range_8', label: '1200 à 1399', start: 1200, end: 1399, value: 132}, {num: 9, active: '', name: 'range_9', label: '1400 à 1600', start: 1400, end: 1600, value: 115}] }, + {weight: 102, active: '', ranges: [{num: 1, active: '', name: 'range_1', label: '0 à 99', start: 0, end: 99, value: 280}, {num: 2, active: '', name: 'range_2', label: '100 à 249', start: 100, end: 249, value: 258}, {num: 3, active: '', name: 'range_3', label: '250 à 399', start: 250, end: 399, value: 233}, {num: 4, active: '', name: 'range_4', label: '400 à 599', start: 400, end: 599, value: 207}, {num: 5, active: '', name: 'range_5', label: '600 à 799', start: 600, end: 799, value: 189}, {num: 6, active: '', name: 'range_6', label: '800 à 999', start: 800, end: 999, value: 171}, {num: 7, active: '', name: 'range_7', label: '1000 à 1199', start: 1000, end: 1199, value: 154}, {num: 8, active: '', name: 'range_8', label: '1200 à 1399', start: 1200, end: 1399, value: 133}, {num: 9, active: '', name: 'range_9', label: '1400 à 1600', start: 1400, end: 1600, value: 116}] }, + {weight: 103, active: '', ranges: [{num: 1, active: '', name: 'range_1', label: '0 à 99', start: 0, end: 99, value: 283}, {num: 2, active: '', name: 'range_2', label: '100 à 249', start: 100, end: 249, value: 260}, {num: 3, active: '', name: 'range_3', label: '250 à 399', start: 250, end: 399, value: 235}, {num: 4, active: '', name: 'range_4', label: '400 à 599', start: 400, end: 599, value: 209}, {num: 5, active: '', name: 'range_5', label: '600 à 799', start: 600, end: 799, value: 190}, {num: 6, active: '', name: 'range_6', label: '800 à 999', start: 800, end: 999, value: 172}, {num: 7, active: '', name: 'range_7', label: '1000 à 1199', start: 1000, end: 1199, value: 155}, {num: 8, active: '', name: 'range_8', label: '1200 à 1399', start: 1200, end: 1399, value: 134}, {num: 9, active: '', name: 'range_9', label: '1400 à 1600', start: 1400, end: 1600, value: 116}] }, + {weight: 104, active: '', ranges: [{num: 1, active: '', name: 'range_1', label: '0 à 99', start: 0, end: 99, value: 285}, {num: 2, active: '', name: 'range_2', label: '100 à 249', start: 100, end: 249, value: 262}, {num: 3, active: '', name: 'range_3', label: '250 à 399', start: 250, end: 399, value: 237}, {num: 4, active: '', name: 'range_4', label: '400 à 599', start: 400, end: 599, value: 210}, {num: 5, active: '', name: 'range_5', label: '600 à 799', start: 600, end: 799, value: 192}, {num: 6, active: '', name: 'range_6', label: '800 à 999', start: 800, end: 999, value: 173}, {num: 7, active: '', name: 'range_7', label: '1000 à 1199', start: 1000, end: 1199, value: 156}, {num: 8, active: '', name: 'range_8', label: '1200 à 1399', start: 1200, end: 1399, value: 134}, {num: 9, active: '', name: 'range_9', label: '1400 à 1600', start: 1400, end: 1600, value: 117}] }, + {weight: 105, active: '', ranges: [{num: 1, active: '', name: 'range_1', label: '0 à 99', start: 0, end: 99, value: 288}, {num: 2, active: '', name: 'range_2', label: '100 à 249', start: 100, end: 249, value: 265}, {num: 3, active: '', name: 'range_3', label: '250 à 399', start: 250, end: 399, value: 239}, {num: 4, active: '', name: 'range_4', label: '400 à 599', start: 400, end: 599, value: 212}, {num: 5, active: '', name: 'range_5', label: '600 à 799', start: 600, end: 799, value: 193}, {num: 6, active: '', name: 'range_6', label: '800 à 999', start: 800, end: 999, value: 174}, {num: 7, active: '', name: 'range_7', label: '1000 à 1199', start: 1000, end: 1199, value: 157}, {num: 8, active: '', name: 'range_8', label: '1200 à 1399', start: 1200, end: 1399, value: 135}, {num: 9, active: '', name: 'range_9', label: '1400 à 1600', start: 1400, end: 1600, value: 118}] }, + {weight: 106, active: '', ranges: [{num: 1, active: '', name: 'range_1', label: '0 à 99', start: 0, end: 99, value: 290}, {num: 2, active: '', name: 'range_2', label: '100 à 249', start: 100, end: 249, value: 267}, {num: 3, active: '', name: 'range_3', label: '250 à 399', start: 250, end: 399, value: 241}, {num: 4, active: '', name: 'range_4', label: '400 à 599', start: 400, end: 599, value: 214}, {num: 5, active: '', name: 'range_5', label: '600 à 799', start: 600, end: 799, value: 195}, {num: 6, active: '', name: 'range_6', label: '800 à 999', start: 800, end: 999, value: 175}, {num: 7, active: '', name: 'range_7', label: '1000 à 1199', start: 1000, end: 1199, value: 158}, {num: 8, active: '', name: 'range_8', label: '1200 à 1399', start: 1200, end: 1399, value: 136}, {num: 9, active: '', name: 'range_9', label: '1400 à 1600', start: 1400, end: 1600, value: 118}] }, + {weight: 107, active: '', ranges: [{num: 1, active: '', name: 'range_1', label: '0 à 99', start: 0, end: 99, value: 293}, {num: 2, active: '', name: 'range_2', label: '100 à 249', start: 100, end: 249, value: 269}, {num: 3, active: '', name: 'range_3', label: '250 à 399', start: 250, end: 399, value: 243}, {num: 4, active: '', name: 'range_4', label: '400 à 599', start: 400, end: 599, value: 215}, {num: 5, active: '', name: 'range_5', label: '600 à 799', start: 600, end: 799, value: 196}, {num: 6, active: '', name: 'range_6', label: '800 à 999', start: 800, end: 999, value: 177}, {num: 7, active: '', name: 'range_7', label: '1000 à 1199', start: 1000, end: 1199, value: 159}, {num: 8, active: '', name: 'range_8', label: '1200 à 1399', start: 1200, end: 1399, value: 136}, {num: 9, active: '', name: 'range_9', label: '1400 à 1600', start: 1400, end: 1600, value: 119}] }, + {weight: 108, active: '', ranges: [{num: 1, active: '', name: 'range_1', label: '0 à 99', start: 0, end: 99, value: 295}, {num: 2, active: '', name: 'range_2', label: '100 à 249', start: 100, end: 249, value: 271}, {num: 3, active: '', name: 'range_3', label: '250 à 399', start: 250, end: 399, value: 245}, {num: 4, active: '', name: 'range_4', label: '400 à 599', start: 400, end: 599, value: 217}, {num: 5, active: '', name: 'range_5', label: '600 à 799', start: 600, end: 799, value: 198}, {num: 6, active: '', name: 'range_6', label: '800 à 999', start: 800, end: 999, value: 178}, {num: 7, active: '', name: 'range_7', label: '1000 à 1199', start: 1000, end: 1199, value: 160}, {num: 8, active: '', name: 'range_8', label: '1200 à 1399', start: 1200, end: 1399, value: 137}, {num: 9, active: '', name: 'range_9', label: '1400 à 1600', start: 1400, end: 1600, value: 119}] }, + {weight: 109, active: '', ranges: [{num: 1, active: '', name: 'range_1', label: '0 à 99', start: 0, end: 99, value: 298}, {num: 2, active: '', name: 'range_2', label: '100 à 249', start: 100, end: 249, value: 274}, {num: 3, active: '', name: 'range_3', label: '250 à 399', start: 250, end: 399, value: 247}, {num: 4, active: '', name: 'range_4', label: '400 à 599', start: 400, end: 599, value: 219}, {num: 5, active: '', name: 'range_5', label: '600 à 799', start: 600, end: 799, value: 199}, {num: 6, active: '', name: 'range_6', label: '800 à 999', start: 800, end: 999, value: 179}, {num: 7, active: '', name: 'range_7', label: '1000 à 1199', start: 1000, end: 1199, value: 161}, {num: 8, active: '', name: 'range_8', label: '1200 à 1399', start: 1200, end: 1399, value: 138}, {num: 9, active: '', name: 'range_9', label: '1400 à 1600', start: 1400, end: 1600, value: 120}] }, + {weight: 110, active: '', ranges: [{num: 1, active: '', name: 'range_1', label: '0 à 99', start: 0, end: 99, value: 300}, {num: 2, active: '', name: 'range_2', label: '100 à 249', start: 100, end: 249, value: 276}, {num: 3, active: '', name: 'range_3', label: '250 à 399', start: 250, end: 399, value: 249}, {num: 4, active: '', name: 'range_4', label: '400 à 599', start: 400, end: 599, value: 220}, {num: 5, active: '', name: 'range_5', label: '600 à 799', start: 600, end: 799, value: 201}, {num: 6, active: '', name: 'range_6', label: '800 à 999', start: 800, end: 999, value: 180}, {num: 7, active: '', name: 'range_7', label: '1000 à 1199', start: 1000, end: 1199, value: 162}, {num: 8, active: '', name: 'range_8', label: '1200 à 1399', start: 1200, end: 1399, value: 138}, {num: 9, active: '', name: 'range_9', label: '1400 à 1600', start: 1400, end: 1600, value: 120}] } +]; + +/* DT48 - 13 mars 2020 */ +export const weightSizesPrev: WeightSize[] = [ {weight: 60, active: '', ranges: [{num: 1, active: '', name: 'range_1', label: '0 à 99', start: 0, end: 99, value: 175}, {num: 2, active: '', name: 'range_2', label: '100 à 249', start: 100, end: 249, value: 161}, {num: 3, active: '', name: 'range_3', label: '250 à 399', start: 250, end: 399, value: 147}, {num: 4, active: '', name: 'range_4', label: '400 à 599', start: 400, end: 599, value: 133}, {num: 5, active: '', name: 'range_5', label: '600 à 799', start: 600, end: 799, value: 124}, {num: 6, active: '', name: 'range_6', label: '800 à 999', start: 800, end: 999, value: 115}, {num: 7, active: '', name: 'range_7', label: '1000 à 1399', start: 1000, end: 1399, value: 107}, {num: 8, active: '', name: 'range_8', label: '1400 à 1799', start: 1400, end: 1799, value: 97}, {num: 9, active: '', name: 'range_9', label: '1800 à 2000', start: 1800, end: 2000, value: 89}] }, {weight: 61, active: '', ranges: [{num: 1, active: '', name: 'range_1', label: '0 à 99', start: 0, end: 99, value: 178}, {num: 2, active: '', name: 'range_2', label: '100 à 249', start: 100, end: 249, value: 163}, {num: 3, active: '', name: 'range_3', label: '250 à 399', start: 250, end: 399, value: 149}, {num: 4, active: '', name: 'range_4', label: '400 à 599', start: 400, end: 599, value: 135}, {num: 5, active: '', name: 'range_5', label: '600 à 799', start: 600, end: 799, value: 126}, {num: 6, active: '', name: 'range_6', label: '800 à 999', start: 800, end: 999, value: 116}, {num: 7, active: '', name: 'range_7', label: '1000 à 1399', start: 1000, end: 1399, value: 108}, {num: 8, active: '', name: 'range_8', label: '1400 à 1799', start: 1400, end: 1799, value: 98}, {num: 9, active: '', name: 'range_9', label: '1800 à 2000', start: 1800, end: 2000, value: 90}] }, {weight: 62, active: '', ranges: [{num: 1, active: '', name: 'range_1', label: '0 à 99', start: 0, end: 99, value: 180}, {num: 2, active: '', name: 'range_2', label: '100 à 249', start: 100, end: 249, value: 166}, {num: 3, active: '', name: 'range_3', label: '250 à 399', start: 250, end: 399, value: 151}, {num: 4, active: '', name: 'range_4', label: '400 à 599', start: 400, end: 599, value: 137}, {num: 5, active: '', name: 'range_5', label: '600 à 799', start: 600, end: 799, value: 127}, {num: 6, active: '', name: 'range_6', label: '800 à 999', start: 800, end: 999, value: 118}, {num: 7, active: '', name: 'range_7', label: '1000 à 1399', start: 1000, end: 1399, value: 109}, {num: 8, active: '', name: 'range_8', label: '1400 à 1799', start: 1400, end: 1799, value: 99}, {num: 9, active: '', name: 'range_9', label: '1800 à 2000', start: 1800, end: 2000, value: 91}] }, diff --git a/src/app/core/services/calculator.service.ts b/src/app/core/services/calculator.service.ts index e59a249..d22b31d 100644 --- a/src/app/core/services/calculator.service.ts +++ b/src/app/core/services/calculator.service.ts @@ -15,7 +15,7 @@ export class CalculatorService { private _getTableColumn(jumps: number): number { let column: number = 0; weightSizes[0].ranges.some((range: Range) => { - if (jumps >= range.start && jumps < range.end) { + if (jumps >= range.start && jumps <= range.end) { column = (range.num-1) return true; } @@ -40,7 +40,7 @@ export class CalculatorService { } private _isInRange(nb: number, range: Range): boolean { - return (nb >= range.start && nb < range.end); + return (nb >= range.start && nb <= range.end); } private _reduceLimit(surface: number, percentOff: number): number { @@ -48,11 +48,15 @@ export class CalculatorService { } public canopySizeCalc(weight: number, jumps: number): CalculatorResult { + /* DT48 - 13 mars 2020 */ + /* const maxRange = 2000; */ + /* DT48 - 08 février 2024 */ + const maxRange = 1600; let result: CalculatorResult = { min: 59, min11: 34 }; - if (jumps > 2000) { + if (jumps > maxRange) { return result; } let index: number = (this._getTableLine(weight) - this._getTableLine(0)); @@ -97,11 +101,15 @@ export class CalculatorService { public getRangeNum(jumps: number): number { let data: Range[] = weightSizes[0].ranges; let num: number = 1; + /* DT48 - 13 mars 2020 */ + /* const maxRange = 2000; */ + /* DT48 - 08 février 2024 */ + const maxRange = 1600; data.some((range: Range): boolean => { - if (jumps >= range.start && jumps < range.end) { + if (jumps >= range.start && jumps <= range.end) { num = range.num; return true; - } else if (jumps > 2000) { + } else if (jumps > maxRange) { num = 9; return true; } diff --git a/src/styles/_sidebar.scss b/src/styles/_sidebar.scss index 0cef0fb..dc7b97b 100755 --- a/src/styles/_sidebar.scss +++ b/src/styles/_sidebar.scss @@ -9,14 +9,12 @@ File: scss Main sidebar ******************/ -mat-sidenav { - width: 240px; - padding-top: 0px; -} #snav{ box-shadow: 1px 0px 20px rgba(0, 0, 0, 0.08); &.mat-drawer{ background: $sidebar; + width: 240px; + padding-top: 0px; } &.mat-drawer-side{ border-right: 0px solid $sidebar; diff --git a/src/styles/styles.scss b/src/styles/styles.scss index 02f19fc..028aec8 100644 --- a/src/styles/styles.scss +++ b/src/styles/styles.scss @@ -57,14 +57,14 @@ $custom-typography: mat.define-typography-config( $body-1: mat.define-typography-level( $font-family: 'Barlow, sans-serif', $font-weight: 400, - $font-size: 12px, + $font-size: 16px, $line-height: 1.42857143, $letter-spacing: normal, ), $body-2: mat.define-typography-level( $font-family: 'Barlow, sans-serif', $font-weight: 500, - $font-size: 12px, + $font-size: 16px, $line-height: 22px, $letter-spacing: normal, )