Charging structure changes
6 unresolved threads
6 unresolved threads
Saket's charging structure changes made into a merge request, rather than direct commits on develop
Merge request reports
Activity
141 141 --bs-btn-disabled-border-color:#0d6efd 142 142 } 143 143 144 .table td { @saket.agrahari please don't make global css styling like this. Make a class that does this, and apply it on the table td elements. We don't necessarily want all tables to have text-align center.
assigned to @remco.tukker
214 223 continue 215 224 216 225 # initialize on first use, so we don't add data for nrens with no answers 217 data.setdefault(nren_name, {question: 0 for question in StaffQuestion})[question] = value 226 data.setdefault(nren_name, @saket.agrahari please change your environment to use pep8 120 lines formatting instead of 79
changed this line in version 2 of the diff
331 348 349 def transfer_charging_structure(): 350 with db.session_scope() as session: 351 nren_dict = helpers.get_uppercase_nren_dict(session) 352 353 rows = query_question(ChargingStructure.charging_structure) 354 for row in rows: 355 nren_name = row[0].upper() 356 value = row[1].replace('"', '').strip() 357 358 if nren_name not in nren_dict: 359 logger.info(f'{nren_name} unknown. Skipping from charging ' 360 f'structure.') 361 continue 362 363 if "do not charge" in value: 51 chargingStructureDataSet.datasets.forEach(dataset => { 52 dataset.data = dataset.data.filter((e, i) => { 53 return filterSelection.selectedNrens.includes(chargingStructureDataSet.labels[i]); 54 }); 55 }); 56 chargingStructureDataSet.labels = chargingStructureDataSet.labels.filter((e) => filterSelection.selectedNrens.includes(e)); 57 58 const labelsNREN = [...new Set(chargingStructureData.map((item: ChargingStructure) => item.NREN))]; 59 const labelsYear = [...new Set(chargingStructureData.map((item: ChargingStructure) => item.YEAR))]; 60 61 const dataLookup = new Map<string, (string | null)>(); 62 chargingStructureData.forEach((item: ChargingStructure) => { 63 const lookupKey = `${item.NREN}/${item.YEAR}` 64 dataLookup.set(lookupKey, item.FEE_TYPE) 65 }) 66 console.log(dataLookup); changed this line in version 2 of the diff
216 37 throw error; 217 38 } 218 39 } 40 interface inputProps { 41 filterSelection: FilterSelection 42 setFilterSelection: React.Dispatch<React.SetStateAction<FilterSelection>> 43 } 219 44 220 function ChargingStructurePage (): React.ReactElement { 221 const [chargingStructureDataSet,setDataset]= useState<ChargingStructureDataset>(EMPTY_DATASET); 222 const [chargingStructureData, setChargingStructureData] = useState<ChargingStructure[]>([]); 45 function ChargingStructurePage({ filterSelection, setFilterSelection }: inputProps): React.ReactElement { 46 const [chargingStructureDataSet, setDataset] = useState<ChargingStructureDataset>(EMPTY_DATASET); 47 const [chargingStructureData, setChargingStructureData] = useState<ChargingStructure[]>([]); 223 48 console.log("ChargingStructurePage"); changed this line in version 2 of the diff
96 <th>No Direct Charge</th> 97 <th>Other</th> 98 </tr> 99 </thead> 100 <tbody> 101 {filterSelection.selectedNrens 102 .sort((a, b) => a>b? 1 : -1) 103 .map((nren: string) => ( 104 <tr key={nren}> 105 <td>{nren}</td> 106 <td > 107 {filterSelection.selectedYears 108 .sort((a, b) => a>b? 1 : -1) 109 .map((year: number, index) => ( 110 <div className="d-inline-block" key={year}>{dataLookup.get(`${nren}/${year}`) === "flat_fee" ? 111 <div className={`rounded-pill color-of-the-year-${index}`} style={{ width: "75px", height: "30px", margin: "2px" }}></div> : changed this line in version 3 of the diff
216 37 throw error; 217 38 } 218 39 } 40 interface inputProps { 41 filterSelection: FilterSelection 42 setFilterSelection: React.Dispatch<React.SetStateAction<FilterSelection>> 43 } 44 45 function ChargingStructurePage({ filterSelection, setFilterSelection }: inputProps): React.ReactElement { 46 const [chargingStructureDataSet, setDataset] = useState<ChargingStructureDataset>(EMPTY_DATASET); changed this line in version 3 of the diff
requested review from @bjarke and @remco.tukker
mentioned in commit dae43cc8
Please register or sign in to reply