diff --git a/src/app/simulator/access-and-offer/collaboration-scheme/collaboration-scheme.component.html b/src/app/simulator/access-and-offer/collaboration-scheme/collaboration-scheme.component.html index ceae9ed397a3e9b43b0778c840cdae48da9af46c..29cbbc2fd1421da062165d1db16b8a434c7ad117 100644 --- a/src/app/simulator/access-and-offer/collaboration-scheme/collaboration-scheme.component.html +++ b/src/app/simulator/access-and-offer/collaboration-scheme/collaboration-scheme.component.html @@ -22,11 +22,10 @@ <th rowspan="2">Total de matrículas da rede <br>pública proposto em 2023 </th> - <th colspan="3">Divisão de responsabilidade pela oferta de matrículas em + <th colspan="2">Divisão de responsabilidade pela oferta de matrículas em {{data.yearCurrentPublicEnrollment}} <sup>(2) (3)</sup></th> </tr> <tr> - <th>Federal (%)</th> <th>Estadual (%)</th> <th>Municipal (%)</th> </tr> @@ -36,12 +35,6 @@ <td class="education-level-column">{{collaborationSchemeByStage.stageDescription}}</td> <td class="text-right">{{collaborationSchemeByStage.numberCurrentPublicEnrollment | number}}</td> <td class="text-right">{{collaborationSchemeByStage.numberProposalPublicEnrollment | number}}</td> - <td> - <input disabled type="text" maxlength="5" - [(ngModel)]="collaborationSchemeByStage.federalPercentage" class="form-control plan-value" - currencyMask - [options]="{ prefix: '', align: 'right', precision: 1, thousands: '.', decimal: ',' }"> - </td> <td> <input disabled type="text" maxlength="5" [(ngModel)]="collaborationSchemeByStage.statePercentage" class="form-control plan-value" currencyMask diff --git a/src/app/simulator/access-and-offer/collaboration-scheme/services/collaboration-scheme.service.ts b/src/app/simulator/access-and-offer/collaboration-scheme/services/collaboration-scheme.service.ts index b6143a477a28bba75b8b42223877fd749bcef077..05fe0c7f046505a55a379ddd065f669d7eb871d1 100644 --- a/src/app/simulator/access-and-offer/collaboration-scheme/services/collaboration-scheme.service.ts +++ b/src/app/simulator/access-and-offer/collaboration-scheme/services/collaboration-scheme.service.ts @@ -54,12 +54,8 @@ export class CollaborationSchemeService implements NavigableComponentService { collaborationScheme.yearCurrentPublicEnrollment = enrollmentOfferYear; collaborationScheme.yearProposalPublicEnrollment = enrollmentOfferYear + 1; - //const resultForEnrollmentProjection: EnrollmentProjection = this.sessionService.getItem<EnrollmentProjection>(Functionality.enrollmentProjection.key); const resultForEnrollmentProjection2: ResultEnrollmentProjection = this.sessionService.getItem<ResultEnrollmentProjection>(Functionality.resultEnrollmentProjection.key); - //console.log(resultForEnrollmentProjection) - //console.log(resultForEnrollmentProjection2) - const resultForViewEnrollmentProjection: ViewEnrollmentByStageSeries = this.sessionService.getItem<ViewEnrollmentByStageSeries>(Functionality.viewEnrollmentByStageAndSeries.key); const resultForSelectLocation: SelectLocation = this.sessionService.getItem<SelectLocation>(Functionality.selectLocation.key); @@ -76,19 +72,12 @@ export class CollaborationSchemeService implements NavigableComponentService { const totalCurrentPublicEnrollment = (totalEnrollmentsByAdmDependencyFederal.quantity + totalEnrollmentsByAdmDependencyState.quantity + totalEnrollmentsByAdmDependencyMunicipal.quantity); if (collaboration) { - //const enrollmentProjectionByLocation: EnrollmentProjectionByLocation = _.head(resultForEnrollmentProjection.enrollmentsProjectionsByLocations); const enrollmentProjectionByLocation2: ResultEnrollmentProjection = resultForEnrollmentProjection2; - //const stageEnrollment = _.find(enrollmentProjectionByLocation.stagesEnrollments, r => r.id === stage.id); const stageEnrollment2 = _.find(enrollmentProjectionByLocation2.resultEnrollmentProjection, r => r.id === stage.id); - //console.log('stageEnrollment',stageEnrollment) - //console.log('stageEnrollment2', stageEnrollment2) - if (stageEnrollment2) { - //collaboration.numberCurrentPublicEnrollment = stageEnrollment.totalCurrentOffers; collaboration.numberCurrentPublicEnrollment = stageEnrollment2.totalEnrollmentCurrent; - //const stagesEnrollmentsProposal = _.find(enrollmentProjectionByLocation.stagesEnrollments, r => r.id === stage.id); const stagesEnrollmentsProposal = _.find(enrollmentProjectionByLocation2.resultEnrollmentProjection, r => r.id === stage.id); //collaboration.numberProposalPublicEnrollment = diff --git a/src/app/simulator/access-and-offer/enrollment-by-stage-series-by-school/services/enrollment-by-stage-series-by-school.service.ts b/src/app/simulator/access-and-offer/enrollment-by-stage-series-by-school/services/enrollment-by-stage-series-by-school.service.ts index b32835eafa7d12e44dff1246bcfb478dd13558a4..b6905b96618fb997aa51e8486a5a86be44232698 100644 --- a/src/app/simulator/access-and-offer/enrollment-by-stage-series-by-school/services/enrollment-by-stage-series-by-school.service.ts +++ b/src/app/simulator/access-and-offer/enrollment-by-stage-series-by-school/services/enrollment-by-stage-series-by-school.service.ts @@ -104,6 +104,7 @@ export class EnrollmentByStageSeriesBySchoolService implements NavigableComponen const descriptionStage: string = resultStages[i].description; let totalEnrollmentDay: number = 0; let totalEnrollmentNight: number = 0; + let totalEnrollmentCurrent: number = 0; let percentageIntegral: number = 0; let serieEnrollments: Array<SerieEnrollments> = new Array<SerieEnrollments>(); @@ -111,6 +112,7 @@ export class EnrollmentByStageSeriesBySchoolService implements NavigableComponen if (resultStages[i].id === stagesEnrollments[j].id) { totalEnrollmentDay = stagesEnrollments[j].totalEnrollments[0].quantity - stagesEnrollments[j].totalEnrollments[0].quantityNocturnal; totalEnrollmentNight = stagesEnrollments[j].totalEnrollments[0].quantityNocturnal; + totalEnrollmentCurrent = totalEnrollmentDay + totalEnrollmentNight; percentageIntegral = stagesEnrollments[j].integralPercentage; if (stagesEnrollments[j].seriesEnrollments) { serieEnrollments = stagesEnrollments[j].seriesEnrollments; @@ -125,6 +127,7 @@ export class EnrollmentByStageSeriesBySchoolService implements NavigableComponen serieEnrollmentsBySchool: this.getSerieEnrollmentsBySchools(serieEnrollments, resultStages[i]), totalEnrollmentDay: totalEnrollmentDay, totalEnrollmentNight: totalEnrollmentNight, + totalEnrollmentCurrent: totalEnrollmentCurrent, percentageIntegral: percentageIntegral })); diff --git a/src/app/simulator/results/budget-forecast-report/services/budget-forecast-report.service.ts b/src/app/simulator/results/budget-forecast-report/services/budget-forecast-report.service.ts index 0a970efbff6f7b543588569ab55639a0a7c02a9c..ddef03068cb16cea9138c851a3f90f4f94a85bfa 100644 --- a/src/app/simulator/results/budget-forecast-report/services/budget-forecast-report.service.ts +++ b/src/app/simulator/results/budget-forecast-report/services/budget-forecast-report.service.ts @@ -611,7 +611,7 @@ export class BudgetForecastReportService { const data: Array<any> = new Array<any>(); let csv = new Csv(); - let yearLabel: string = '2023' + const yearLabel: string = '2023'; // Offer Dimensions if (datas === DatasCsvEnum.OfferDimensions) { diff --git a/src/app/simulator/results/financing-federated-entities-report/services/financing-federated-entities-report.service.ts b/src/app/simulator/results/financing-federated-entities-report/services/financing-federated-entities-report.service.ts index 5f73531920c9f1d61736e475a95f57315910bbc0..2498e74f18ce75414aa32ac0e6d795e959dd6a12 100644 --- a/src/app/simulator/results/financing-federated-entities-report/services/financing-federated-entities-report.service.ts +++ b/src/app/simulator/results/financing-federated-entities-report/services/financing-federated-entities-report.service.ts @@ -1005,7 +1005,6 @@ export class FinancingFederatedEntitiesReportService { } } } - ////console.log(datasReport) return datasReport; } @@ -1482,13 +1481,13 @@ export class FinancingFederatedEntitiesReportService { if (datasByStageResult) { const enrollmentTotal = datasByStageResult.enrollmentDay + datasByStageResult.enrollmentNocturnal; - const integralPercentage = enrollmentTotal !== 0 ? (cityResult.datasByStage[i].enrollmentIntegralTotal / enrollmentTotal) * 100 : 0; cityResult.datasByStage[i].enrollmentDay += datasByStageResult.enrollmentDay; cityResult.datasByStage[i].enrollmentNocturnal += datasByStageResult.enrollmentNocturnal; cityResult.datasByStage[i].totalEmployee += datasByStageResult.totalEmployee; cityResult.datasByStage[i].totalTeacherNumber += datasByStageResult.totalTeacherNumber; cityResult.datasByStage[i].enrollmentIntegralTotal += (datasByStageResult.integralPercentage / 100) * enrollmentTotal; + const integralPercentage = enrollmentTotal !== 0 ? (cityResult.datasByStage[i].enrollmentIntegralTotal / enrollmentTotal) * 100 : 0; cityResult.datasByStage[i].integralPercentage = integralPercentage; const calculoIntegralEnrollment = integralPercentage !== 0 ? enrollmentTotal * integralPercentage : 0; @@ -1519,9 +1518,9 @@ export class FinancingFederatedEntitiesReportService { if (result.locationId === LocationEnum.rural) { cityResult.enrollmentTotalRural += result.enrollmentTotal; - cityResult.percentageEnrollmentRural = cityResult.enrollmentTotalRural > 0 && cityResult.enrollmentTotal > 0 ? (cityResult.enrollmentTotalRural / cityResult.enrollmentTotal) * 100 : 0; - cityResult.rural = (cityResult.percentageEnrollmentRural / 100) * cityResult.enrollmentTotal } + cityResult.percentageEnrollmentRural = cityResult.enrollmentTotalRural > 0 && cityResult.enrollmentTotal > 0 ? (cityResult.enrollmentTotalRural / cityResult.enrollmentTotal) * 100 : 0; + cityResult.rural = (cityResult.percentageEnrollmentRural / 100) * cityResult.enrollmentTotal; } private setSumTotalResults(cityResultTotal: FinancingFederatedEntitiesReport, result: FinancingFederatedEntitiesReport) {