Rev 1916 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 1916 | Rev 1929 | ||
|---|---|---|---|
| Line 11... | Line 11... | ||
| 11 | import pt.estgp.estgweb.domain.dao.DaoFactory; |
11 | import pt.estgp.estgweb.domain.dao.DaoFactory; |
| 12 | import pt.estgp.estgweb.filters.chains.ResourceAccessControlEnum; |
12 | import pt.estgp.estgweb.filters.chains.ResourceAccessControlEnum; |
| 13 | import pt.estgp.estgweb.services.courses.coursereport.CourseReportUtils; |
13 | import pt.estgp.estgweb.services.courses.coursereport.CourseReportUtils; |
| 14 | import pt.estgp.estgweb.services.courses.coursereport.documentmodel.*; |
14 | import pt.estgp.estgweb.services.courses.coursereport.documentmodel.*; |
| 15 | import pt.estgp.estgweb.services.courses.coursereport.documentmodel.courseunitreport.CourseUnitSection; |
15 | import pt.estgp.estgweb.services.courses.coursereport.documentmodel.courseunitreport.CourseUnitSection; |
| - | 16 | import pt.estgp.estgweb.services.courses.coursereport.documentmodel.learningresults.LearningAnalysisSection; |
|
| 16 | import pt.estgp.estgweb.services.courses.coursereport.documentmodel.learningresults.LearningGlobalAnalysisSection; |
17 | import pt.estgp.estgweb.services.courses.coursereport.documentmodel.learningresults.LearningGlobalAnalysisSection; |
| 17 | import pt.estgp.estgweb.services.courses.coursereport.documentmodel.learningresults.components.*; |
18 | import pt.estgp.estgweb.services.courses.coursereport.documentmodel.learningresults.components.*; |
| 18 | import pt.estgp.estgweb.services.courses.coursereport.documentmodel.reportucsummary.CourseUnitDtpStat; |
19 | import pt.estgp.estgweb.services.courses.coursereport.documentmodel.reportucsummary.CourseUnitDtpStat; |
| 19 | import pt.estgp.estgweb.services.courses.coursereport.documentmodel.reportucsummary.UnitDtpSemester; |
20 | import pt.estgp.estgweb.services.courses.coursereport.documentmodel.reportucsummary.UnitDtpSemester; |
| 20 | import pt.estgp.estgweb.services.courses.coursereport.documentmodel.reportucsummary.UnitsDtpTable; |
21 | import pt.estgp.estgweb.services.courses.coursereport.documentmodel.reportucsummary.UnitsDtpTable; |
| Line 435... | Line 436... | ||
| 435 | 436 | ||
| 436 | RepositoryFile4JsonView view; |
437 | RepositoryFile4JsonView view; |
| 437 | if(imageInitialized) |
438 | if(imageInitialized) |
| 438 | { |
439 | { |
| 439 | 1.5.0/docs/api/java/lang/String.html">String identifier = chartImg.getImage().getIdentifier(); |
440 | 1.5.0/docs/api/java/lang/String.html">String identifier = chartImg.getImage().getIdentifier(); |
| 440 | view = repositoryService.replaceRepositoryFileFromFileUpload(identifier, fileUploaded, ResourceAccessControlEnum.privateDomain, session); |
441 | view = repositoryService.replaceRepositoryFileFromFileUpload(identifier, fileUploaded, ResourceAccessControlEnum.publicDomain, session); |
| 441 | } |
442 | } |
| 442 | else |
443 | else |
| 443 | { |
444 | { |
| 444 | view = repositoryService.storeRepositoryFileFromFileUpload(fileUploaded,ResourceAccessControlEnum.privateDomain,session); |
445 | view = repositoryService.storeRepositoryFileFromFileUpload(fileUploaded,ResourceAccessControlEnum.publicDomain,session); |
| 445 | } |
446 | } |
| 446 | chartImg.setImage(view); |
447 | chartImg.setImage(view); |
| 447 | //TODO FALTA GUARDAR O JSON NO CURSO |
448 | //TODO FALTA GUARDAR O JSON NO CURSO |
| 448 | return view.toJson(); |
449 | return view.toJson(); |
| 449 | } |
450 | } |
| Line 468... | Line 469... | ||
| 468 | 469 | ||
| 469 | RepositoryFile4JsonView view; |
470 | RepositoryFile4JsonView view; |
| 470 | if(imageInitialized) |
471 | if(imageInitialized) |
| 471 | { |
472 | { |
| 472 | 1.5.0/docs/api/java/lang/String.html">String identifier = chartImg.getImage().getIdentifier(); |
473 | 1.5.0/docs/api/java/lang/String.html">String identifier = chartImg.getImage().getIdentifier(); |
| 473 | view = repositoryService.replaceRepositoryFileFromFileUpload(identifier, fileUploaded, ResourceAccessControlEnum.privateDomain, session); |
474 | view = repositoryService.replaceRepositoryFileFromFileUpload(identifier, fileUploaded, ResourceAccessControlEnum.publicDomain, session); |
| 474 | } |
475 | } |
| 475 | else |
476 | else |
| 476 | { |
477 | { |
| 477 | view = repositoryService.storeRepositoryFileFromFileUpload(fileUploaded,ResourceAccessControlEnum.privateDomain,session); |
478 | view = repositoryService.storeRepositoryFileFromFileUpload(fileUploaded,ResourceAccessControlEnum.publicDomain,session); |
| - | 479 | } |
|
| - | 480 | chartImg.setImage(view); |
|
| - | 481 | //TODO FALTA GUARDAR O JSON NO CURSO |
|
| - | 482 | return view.toJson(); |
|
| - | 483 | } |
|
| - | 484 | ||
| - | 485 | public 1.5.0/docs/api/java/lang/String.html">String generateGenerateGlobalLearningResultsChartSem(1.5.0/docs/api/java/lang/String.html">String reportDocumentJson, 1.5.0/docs/api/java/lang/String.html">String semesterCode, UserSession session) throws 1.5.0/docs/api/java/io/IOException.html">IOException { |
|
| - | 486 | ||
| - | 487 | CourseReportDocument reportDocument = CourseReportDocument.fromJson(reportDocumentJson); |
|
| - | 488 | ||
| - | 489 | LearningResultsSection learningResultsSection = (LearningResultsSection) reportDocument.findDocumentSection(LearningResultsSection.class); |
|
| - | 490 | ||
| - | 491 | LearningAnalysisSection learningAnalysisSection = (LearningAnalysisSection) learningResultsSection.findSection(LearningAnalysisSection.class); |
|
| - | 492 | ||
| - | 493 | LearningResultsChartSem chartImg = (LearningResultsChartSem) learningAnalysisSection.findDocComponent(LearningResultsChartSem.class, semesterCode); |
|
| - | 494 | UnitsLearningResultsTable table = (UnitsLearningResultsTable) learningResultsSection.findDocComponent(UnitsLearningResultsTable.class); |
|
| - | 495 | ||
| - | 496 | ||
| - | 497 | ||
| - | 498 | FileUploaded fileUploaded = chartImg.generateChart2tmp(table,reportDocument); |
|
| - | 499 | ||
| - | 500 | ||
| - | 501 | ||
| - | 502 | RepositoryService repositoryService = new RepositoryService(); |
|
| - | 503 | ||
| - | 504 | ||
| - | 505 | boolean imageInitialized = chartImg.getImage() != null |
|
| - | 506 | && |
|
| - | 507 | chartImg.getImage().getIdentifier() != null; |
|
| - | 508 | ||
| - | 509 | ||
| - | 510 | RepositoryFile4JsonView view; |
|
| - | 511 | ||
| - | 512 | if(imageInitialized) |
|
| - | 513 | { |
|
| - | 514 | 1.5.0/docs/api/java/lang/String.html">String identifier = chartImg.getImage().getIdentifier(); |
|
| - | 515 | view = repositoryService.replaceRepositoryFileFromFileUpload(identifier, fileUploaded, ResourceAccessControlEnum.publicDomain, session); |
|
| - | 516 | } |
|
| - | 517 | else |
|
| - | 518 | { |
|
| - | 519 | view = repositoryService.storeRepositoryFileFromFileUpload(fileUploaded,ResourceAccessControlEnum.publicDomain,session); |
|
| 478 | } |
520 | } |
| 479 | chartImg.setImage(view); |
521 | chartImg.setImage(view); |
| 480 | //TODO FALTA GUARDAR O JSON NO CURSO |
522 | //TODO FALTA GUARDAR O JSON NO CURSO |
| 481 | return view.toJson(); |
523 | return view.toJson(); |
| 482 | } |
524 | } |
| Line 506... | Line 548... | ||
| 506 | if (cy != null) { |
548 | if (cy != null) { |
| 507 | courseReportJson = cy.getCourseReportDocument(); |
549 | courseReportJson = cy.getCourseReportDocument(); |
| 508 | } |
550 | } |
| 509 | 551 | ||
| 510 | if (courseReportJson == null) { |
552 | if (courseReportJson == null) { |
| 511 | CourseReportDocument courseReport = null; |
- | |
| 512 | - | ||
| 513 | try { |
553 | try { |
| 514 | courseReport = new CourseReportServices().createNewCourseReportDocument(courseCode, year); |
554 | CourseReportDocument courseReport = new CourseReportServices().createNewCourseReportDocument(courseCode, year); |
| 515 | courseReportJson = courseReport.toJson(); |
555 | courseReportJson = courseReport.toJson(); |
| - | 556 | saveCourseReportDocument(courseReportJson, session); |
|
| 516 | } catch (1.5.0/docs/api/java/lang/Throwable.html">Throwable e) { |
557 | } catch (1.5.0/docs/api/java/lang/Throwable.html">Throwable e) { |
| 517 | 1.5.0/docs/api/java/lang/System.html">System.out.println(e); |
558 | 1.5.0/docs/api/java/lang/System.html">System.out.println(e); |
| 518 | e.printStackTrace(); |
559 | e.printStackTrace(); |
| 519 | } |
560 | } |
| 520 | } |
561 | } |