Skip to content

Commit

Permalink
Aggiornamento2
Browse files Browse the repository at this point in the history
  • Loading branch information
@SMacOne
SMacOne committed Dec 9, 2019
1 parent ad0bf3a commit 3082270
Show file tree
Hide file tree
Showing 4 changed files with 1,141 additions and 500 deletions.
256 changes: 128 additions & 128 deletions src/main/java/it/istat/is2/dataset/controller/DatasetController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -225,134 +225,134 @@ public String loadInputData(HttpSession session, HttpServletRequest request, Mod
return "redirect:/sessione/mostradataset/" + idsessione;
}

@RequestMapping("/createField/{idfile}/{idColonna}/{commandField}/{charOrString}/{upperLower}/{newField}/{columnOrder}/{numRows}")
public String createField(Model model, @PathVariable("idfile") String idfile,
@PathVariable("idColonna") String idColonna, @PathVariable("commandField") String commandField,
@PathVariable("charOrString") String charOrString, @PathVariable("upperLower") String upperLower,
@PathVariable("newField") String newField, @PathVariable("columnOrder") String columnOrder,
@PathVariable("numRows") String numRows) {

DatasetFile dFile = datasetService.createField(idfile, idColonna, commandField, charOrString, upperLower,
newField, columnOrder, numRows);

List<DatasetColumn> colonne = datasetService.findAllNameColum(Long.parseLong(idfile));
List<StatisticalVariableCls> variabiliSum = datasetService.findAllVariabiliSum();

model.addAttribute("colonne", colonne);
model.addAttribute("idfile", idfile);
model.addAttribute("variabili", variabiliSum);
model.addAttribute("dfile", dFile);
model.addAttribute("numRighe", numRows);

return "dataset/preview";
}

@RequestMapping("/createMergedField/{idfile}/{columnOrder}/{numRows}/{fieldsToMerge}/{newField}")
public String createMergedField(Model model, @PathVariable("idfile") String idfile,
@PathVariable("columnOrder") String columnOrder, @PathVariable("numRows") String numRows,
@PathVariable("fieldsToMerge") String fieldsToMerge, @PathVariable("newField") String newField) {

DatasetFile dFile = datasetService.createMergedField(idfile, columnOrder, numRows, fieldsToMerge, newField);

List<DatasetColumn> colonne = datasetService.findAllNameColum(Long.parseLong(idfile));
List<StatisticalVariableCls> variabiliSum = datasetService.findAllVariabiliSum();

model.addAttribute("colonne", colonne);
model.addAttribute("idfile", idfile);
model.addAttribute("variabili", variabiliSum);
model.addAttribute("dfile", dFile);
model.addAttribute("numRighe", numRows);

return "dataset/preview";
}

@RequestMapping("/createParsedFields/{idfile}/{idColonna}/{columnOrder}/{numRows}/{executeCommand}/{commandValue}/{startTo}/{newField1}/{newField2}")
public String createParsedFields(Model model, @PathVariable("idfile") String idfile, @PathVariable("idColonna") String idColonna,
@PathVariable("columnOrder") String columnOrder, @PathVariable("numRows") String numRows,
@PathVariable("executeCommand") String executeCommand, @PathVariable("commandValue") String commandValue, @PathVariable("startTo") String startTo, @PathVariable("newField1") String newField1 , @PathVariable("newField2") String newField2) {

DatasetFile dFile = datasetService.createParsedFields(idfile, idColonna, columnOrder, numRows, executeCommand, commandValue, startTo, newField1, newField2);

List<DatasetColumn> colonne = datasetService.findAllNameColum(Long.parseLong(idfile));
List<StatisticalVariableCls> variabiliSum = datasetService.findAllVariabiliSum();

model.addAttribute("colonne", colonne);
model.addAttribute("idfile", idfile);
model.addAttribute("variabili", variabiliSum);
model.addAttribute("dfile", dFile);
model.addAttribute("numRighe", numRows);

return "dataset/preview";
}


@RequestMapping("/deleteField/{idfile}/{idColonna}/{numCols}/{numRows}")
public String deleteField(Model model, @PathVariable("idfile") String idfile, @PathVariable("idColonna") String idColonna,
@PathVariable("numCols") String numCols, @PathVariable("numRows") String numRows) {

DatasetFile dFile = datasetService.deleteField(idfile, idColonna);




List<DatasetColumn> colonne = datasetService.findAllNameColum(Long.parseLong(idfile));


model.addAttribute("colonne", colonne);
model.addAttribute("idfile", idfile);
model.addAttribute("dfile", dFile);
model.addAttribute("numRighe", numRows);

return "dataset/preview";
}




@RequestMapping(value = "/repairField", method = RequestMethod.POST)
public String loadRepairField(Model model, @RequestParam("fileCSV") MultipartFile[] fileCSV, @RequestParam("idDataset") String idDataset, @RequestParam("idColonna") String idColonna , @RequestParam("numRighe") String numRighe,
@RequestParam("numColonne") String numColonne, @RequestParam("fieldName") String fieldName, @RequestParam("separatore") String separatore) throws IOException {

notificationService.removeAllMessages();

File f = FileHandler.convertMultipartFileToFile(fileCSV[0]);



String pathTmpFile = f.getAbsolutePath().replace("\\", "/");
HashMap<Integer, String> valoriHeaderNum = null;
try {
valoriHeaderNum = FileHandler.getCampiHeaderNumIndex(pathTmpFile, separatore.toCharArray()[0]);
} catch (Exception e) {
notificationService.addErrorMessage(
messages.getMessage("file.read.error", null, LocaleContextHolder.getLocale()), e.getMessage());
}

HashMap<String, ArrayList<String>> campiL = null;
try {
campiL = FileHandler.getArrayListFromCsv2(pathTmpFile, 2, separatore.toCharArray()[0],
valoriHeaderNum);
} catch (Exception e) {
notificationService.addErrorMessage(
messages.getMessage("file.read.error", null, LocaleContextHolder.getLocale()), e.getMessage());
}



DatasetFile dFile = datasetService.createFixedField(idDataset, idColonna, valoriHeaderNum, campiL,
fieldName, numColonne, numRighe);

List<DatasetColumn> colonne = datasetService.findAllNameColum(Long.parseLong(idDataset));

model.addAttribute("colonne", colonne);
model.addAttribute("idfile", idDataset);
model.addAttribute("dfile", dFile);
model.addAttribute("numRighe", numRighe);


return "dataset/preview";
}

// @RequestMapping("/createField/{idfile}/{idColonna}/{commandField}/{charOrString}/{upperLower}/{newField}/{columnOrder}/{numRows}")
// public String createField(Model model, @PathVariable("idfile") String idfile,
// @PathVariable("idColonna") String idColonna, @PathVariable("commandField") String commandField,
// @PathVariable("charOrString") String charOrString, @PathVariable("upperLower") String upperLower,
// @PathVariable("newField") String newField, @PathVariable("columnOrder") String columnOrder,
// @PathVariable("numRows") String numRows) {
//
// DatasetFile dFile = datasetService.createField(idfile, idColonna, commandField, charOrString, upperLower,
// newField, columnOrder, numRows);
//
// List<DatasetColumn> colonne = datasetService.findAllNameColum(Long.parseLong(idfile));
// List<StatisticalVariableCls> variabiliSum = datasetService.findAllVariabiliSum();
//
// model.addAttribute("colonne", colonne);
// model.addAttribute("idfile", idfile);
// model.addAttribute("variabili", variabiliSum);
// model.addAttribute("dfile", dFile);
// model.addAttribute("numRighe", numRows);
//
// return "dataset/preview";
// }
//
// @RequestMapping("/createMergedField/{idfile}/{columnOrder}/{numRows}/{fieldsToMerge}/{newField}")
// public String createMergedField(Model model, @PathVariable("idfile") String idfile,
// @PathVariable("columnOrder") String columnOrder, @PathVariable("numRows") String numRows,
// @PathVariable("fieldsToMerge") String fieldsToMerge, @PathVariable("newField") String newField) {
//
// DatasetFile dFile = datasetService.createMergedField(idfile, columnOrder, numRows, fieldsToMerge, newField);
//
// List<DatasetColumn> colonne = datasetService.findAllNameColum(Long.parseLong(idfile));
// List<StatisticalVariableCls> variabiliSum = datasetService.findAllVariabiliSum();
//
// model.addAttribute("colonne", colonne);
// model.addAttribute("idfile", idfile);
// model.addAttribute("variabili", variabiliSum);
// model.addAttribute("dfile", dFile);
// model.addAttribute("numRighe", numRows);
//
// return "dataset/preview";
// }
//
// @RequestMapping("/createParsedFields/{idfile}/{idColonna}/{columnOrder}/{numRows}/{executeCommand}/{commandValue}/{startTo}/{newField1}/{newField2}")
// public String createParsedFields(Model model, @PathVariable("idfile") String idfile, @PathVariable("idColonna") String idColonna,
// @PathVariable("columnOrder") String columnOrder, @PathVariable("numRows") String numRows,
// @PathVariable("executeCommand") String executeCommand, @PathVariable("commandValue") String commandValue, @PathVariable("startTo") String startTo, @PathVariable("newField1") String newField1 , @PathVariable("newField2") String newField2) {
//
// DatasetFile dFile = datasetService.createParsedFields(idfile, idColonna, columnOrder, numRows, executeCommand, commandValue, startTo, newField1, newField2);
//
// List<DatasetColumn> colonne = datasetService.findAllNameColum(Long.parseLong(idfile));
// List<StatisticalVariableCls> variabiliSum = datasetService.findAllVariabiliSum();
//
// model.addAttribute("colonne", colonne);
// model.addAttribute("idfile", idfile);
// model.addAttribute("variabili", variabiliSum);
// model.addAttribute("dfile", dFile);
// model.addAttribute("numRighe", numRows);
//
// return "dataset/preview";
// }
//
//
// @RequestMapping("/deleteField/{idfile}/{idColonna}/{numCols}/{numRows}")
// public String deleteField(Model model, @PathVariable("idfile") String idfile, @PathVariable("idColonna") String idColonna,
// @PathVariable("numCols") String numCols, @PathVariable("numRows") String numRows) {
//
// DatasetFile dFile = datasetService.deleteField(idfile, idColonna);
//
//
//
//
// List<DatasetColumn> colonne = datasetService.findAllNameColum(Long.parseLong(idfile));
//
//
// model.addAttribute("colonne", colonne);
// model.addAttribute("idfile", idfile);
// model.addAttribute("dfile", dFile);
// model.addAttribute("numRighe", numRows);
//
// return "dataset/preview";
// }
//
//
//
//
// @RequestMapping(value = "/repairField", method = RequestMethod.POST)
// public String loadRepairField(Model model, @RequestParam("fileCSV") MultipartFile[] fileCSV, @RequestParam("idDataset") String idDataset, @RequestParam("idColonna") String idColonna , @RequestParam("numRighe") String numRighe,
// @RequestParam("numColonne") String numColonne, @RequestParam("fieldName") String fieldName, @RequestParam("separatore") String separatore) throws IOException {
//
// notificationService.removeAllMessages();
//
// File f = FileHandler.convertMultipartFileToFile(fileCSV[0]);
//
//
//
// String pathTmpFile = f.getAbsolutePath().replace("\\", "/");
// HashMap<Integer, String> valoriHeaderNum = null;
// try {
// valoriHeaderNum = FileHandler.getCampiHeaderNumIndex(pathTmpFile, separatore.toCharArray()[0]);
// } catch (Exception e) {
// notificationService.addErrorMessage(
// messages.getMessage("file.read.error", null, LocaleContextHolder.getLocale()), e.getMessage());
// }
//
// HashMap<String, ArrayList<String>> campiL = null;
// try {
// campiL = FileHandler.getArrayListFromCsv2(pathTmpFile, 2, separatore.toCharArray()[0],
// valoriHeaderNum);
// } catch (Exception e) {
// notificationService.addErrorMessage(
// messages.getMessage("file.read.error", null, LocaleContextHolder.getLocale()), e.getMessage());
// }
//
//
//
// DatasetFile dFile = datasetService.createFixedField(idDataset, idColonna, valoriHeaderNum, campiL,
// fieldName, numColonne, numRighe);
//
// List<DatasetColumn> colonne = datasetService.findAllNameColum(Long.parseLong(idDataset));
//
// model.addAttribute("colonne", colonne);
// model.addAttribute("idfile", idDataset);
// model.addAttribute("dfile", dFile);
// model.addAttribute("numRighe", numRighe);
//
//
// return "dataset/preview";
// }
//

@GetMapping(value = "/deleteDataset/{datasetid}")
public String deleteDataset(HttpSession session, Model model, @AuthenticationPrincipal User user,
Expand Down
Loading

0 comments on commit 3082270

Please sign in to comment.