Index: lams_admin/web/import/importGroups.jsp =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1ba327f73cb27c822d8a4ef36c386dd5a1432aef --- lams_admin/web/import/importGroups.jsp (.../importGroups.jsp) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_admin/web/import/importGroups.jsp (.../importGroups.jsp) (revision 1ba327f73cb27c822d8a4ef36c386dd5a1432aef) @@ -1,105 +1,133 @@ + + <%@ include file="/taglibs.jsp"%> <%@ page import="org.lamsfoundation.lams.admin.service.IImportService" %> <%@ page import="java.util.List" %> <%@ page import="org.lamsfoundation.lams.usermanagement.OrganisationType" %> <%@ page import="org.lamsfoundation.lams.util.Configuration"%> <%@ page import="org.lamsfoundation.lams.util.ConfigurationKeys"%> -<%@ page import="org.lamsfoundation.lams.util.FileValidatorUtil" %> +<%@ page import="org.lamsfoundation.lams.util.FileValidatorSpringUtil" %> - + + + + ${title} -<%=Configuration.get(ConfigurationKeys.UPLOAD_FILE_LARGE_MAX_SIZE)%> -<%=FileValidatorUtil.formatSize(Configuration.getAsInt(ConfigurationKeys.UPLOAD_FILE_LARGE_MAX_SIZE))%> -<%=Configuration.get(ConfigurationKeys.EXE_EXTENSIONS)%> + - - - - + - function verifyAndSubmit() { - if ( "undefined" === typeof bCancel || ! bCancel ) { - var fileSelect = document.getElementById('file'); - var files = fileSelect.files; - if (files.length == 0) { - clearFileError(); - showFileError(''); - return false; - } else { - var file = files[0]; - if ( ! validateShowErrorSpreadsheetType(file, '', false) - || ! validateShowErrorFileSize(file, '${UPLOAD_FILE_MAX_SIZE}', '') ) { + <%=Configuration.get(ConfigurationKeys.UPLOAD_FILE_LARGE_MAX_SIZE)%> + <%=FileValidatorSpringUtil.formatSize(Configuration.getAsInt(ConfigurationKeys.UPLOAD_FILE_LARGE_MAX_SIZE))%> + <%=Configuration.get(ConfigurationKeys.EXE_EXTENSIONS)%> + + + + + + + + + + + + + + +

-

- -
- - -

- - - <% - List results = (List)request.getAttribute("results"); - for (int i=0; i"); - List rowResult = (List)results.get(i); - if (rowResult != null && rowResult.size() >= 4) { - if (rowResult.get(3).equals(OrganisationType.COURSE_TYPE.toString())) { - out.print(""); - out.print(""); - } else if (rowResult.get(3).equals(OrganisationType.CLASS_TYPE.toString())) { - out.print(""); - out.print(""); +
+ + +

+
"+rowResult.get(0)+""+rowResult.get(1)+""+rowResult.get(0)+""+rowResult.get(1)+"
+ + <% + List results = (List)request.getAttribute("results"); + for (int i=0; i"); + List rowResult = (List)results.get(i); + if (rowResult != null && rowResult.size() >= 4) { + if (rowResult.get(3).equals(OrganisationType.COURSE_TYPE.toString())) { + out.print(""); + out.print(""); + } else if (rowResult.get(3).equals(OrganisationType.CLASS_TYPE.toString())) { + out.print(""); + out.print(""); + } + } else { // it's an error message + out.print(""); } - } else { // it's an error message - out.print(""); + out.println(""); } - out.println(""); - } - %> -
"+rowResult.get(0)+""+rowResult.get(1)+""+rowResult.get(0)+""+rowResult.get(1)+""); + for (int j=0; j"); + } + out.print(""); - for (int j=0; j"); - } - out.print("
-
- + %> + +
+ + +

+

+

+

+

+ + + + + + + +
+ " onclick="bCancel=true;" class="btn btn-default"> + " />   +
+ + + +
+ + + + -

-

-

-

-

- - - - -
- -   -
- - - -