|  | @@ -8,8 +8,9 @@ const {
 | 
	
		
			
				|  |  |  exports.laporan = handleError(async (req, res) => {
 | 
	
		
			
				|  |  |    const user = req.user
 | 
	
		
			
				|  |  |    const data = {}
 | 
	
		
			
				|  |  | -  const laporan = await cekBanyakDataLaporan(user)
 | 
	
		
			
				|  |  | +  const date = new Date()
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | +  // let berdasarkan_tahun = {}
 | 
	
		
			
				|  |  |    const {
 | 
	
		
			
				|  |  |      jumlahLaporan,
 | 
	
		
			
				|  |  |      jadwal,
 | 
	
	
		
			
				|  | @@ -22,14 +23,44 @@ exports.laporan = handleError(async (req, res) => {
 | 
	
		
			
				|  |  |      tahun,
 | 
	
		
			
				|  |  |      listJadwal,
 | 
	
		
			
				|  |  |    } = req.query
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  | +  // if (tahun) {
 | 
	
		
			
				|  |  | +  berdasarkan_tahun = {
 | 
	
		
			
				|  |  | +    $and: [
 | 
	
		
			
				|  |  | +      {
 | 
	
		
			
				|  |  | +        createdAt: {
 | 
	
		
			
				|  |  | +          $gte: new Date(`${tahun || date.getFullYear()}`),
 | 
	
		
			
				|  |  | +        },
 | 
	
		
			
				|  |  | +      },
 | 
	
		
			
				|  |  | +      {
 | 
	
		
			
				|  |  | +        createdAt: {
 | 
	
		
			
				|  |  | +          $lt: new Date(`${parseInt(tahun) + 1 || date.getFullYear() + 1}`),
 | 
	
		
			
				|  |  | +        },
 | 
	
		
			
				|  |  | +      },
 | 
	
		
			
				|  |  | +    ],
 | 
	
		
			
				|  |  | +  }
 | 
	
		
			
				|  |  | +  // }
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  | +  const laporan = await cekBanyakDataLaporan(user, { ...berdasarkan_tahun })
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  |    if (jumlahLaporan == 'true') {
 | 
	
		
			
				|  |  | -    const delegasi = await cekBanyakDataLaporan(user, { delegasi: true })
 | 
	
		
			
				|  |  | -    const ditutup = await cekBanyakDataLaporan(user, { aktif: false })
 | 
	
		
			
				|  |  | +    const delegasi = await cekBanyakDataLaporan(user, {
 | 
	
		
			
				|  |  | +      delegasi: true,
 | 
	
		
			
				|  |  | +      ...berdasarkan_tahun,
 | 
	
		
			
				|  |  | +    })
 | 
	
		
			
				|  |  | +    const ditutup = await cekBanyakDataLaporan(user, {
 | 
	
		
			
				|  |  | +      aktif: false,
 | 
	
		
			
				|  |  | +      ...berdasarkan_tahun,
 | 
	
		
			
				|  |  | +    })
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |      data.jumlah_laporan = {
 | 
	
		
			
				|  |  |        dikti: laporan.length,
 | 
	
		
			
				|  |  |        lldikti: delegasi.length,
 | 
	
		
			
				|  |  |        ditutup: ditutup.length,
 | 
	
		
			
				|  |  | +      tes: {
 | 
	
		
			
				|  |  | +        delegasi: true,
 | 
	
		
			
				|  |  | +        ...berdasarkan_tahun,
 | 
	
		
			
				|  |  | +      },
 | 
	
		
			
				|  |  |      }
 | 
	
		
			
				|  |  |    }
 | 
	
		
			
				|  |  |  
 |