Index: dbLearnStar-webApp/pom.xml
===================================================================
--- dbLearnStar-webApp/pom.xml (revision 098436bddd5c32eb21cd934a091b07987f31b6a8)
+++ dbLearnStar-webApp/pom.xml (revision 6f7196682564b7aa4b11e7226b1b57eb3ea849cb)
@@ -12,5 +12,5 @@
dblearnstar
dblearnstar
- 0.8.13
+ 0.8.14
dbLearnStar
Index: dbLearnStar-webApp/src/main/java/dblearnstar/webapp/services/EvaluationServiceImpl.java
===================================================================
--- dbLearnStar-webApp/src/main/java/dblearnstar/webapp/services/EvaluationServiceImpl.java (revision 098436bddd5c32eb21cd934a091b07987f31b6a8)
+++ dbLearnStar-webApp/src/main/java/dblearnstar/webapp/services/EvaluationServiceImpl.java (revision 6f7196682564b7aa4b11e7226b1b57eb3ea849cb)
@@ -483,7 +483,8 @@
// + ")) union ((select * from " + evalViewName + ") except (" + queryStringManip + "))";
- String evalQueryString = "select 'In Submission' as WHERE, * from ( ( " + queryStringManip + " ) except ( select * from " + evalViewName
- + " ) ) eden union select 'In Correct Solution' as WHERE, * from ( ( select * from " + evalViewName + " ) except ( " + queryStringManip
- + " ) ) dva order by 1,2";
+ String evalQueryString = "select 'In Submission' as WHERE, * from ( ( "
+ + queryStringManip + " ) except ( select * from " + evalViewName
+ + " ) ) eden union select 'In Correct Solution' as WHERE, * from ( ( select * from "
+ + evalViewName + " ) except ( " + queryStringManip + " ) ) dva order by 1,2";
logger.debug("user {} issued evalQueryString: {}", userName, evalQueryString);
@@ -575,4 +576,7 @@
int numColumns = rs.getMetaData().getColumnCount();
+ logger.debug("Executing Query {} {} {} ", submission.getStudentStartedTest().getStudent().getPerson().getUserName(), queryToRun,
+ numColumns);
+
while (isNextRow) {
String[] o = new String[numColumns + 2];
@@ -604,6 +608,8 @@
String[] queryToRun = {
"""
- select 'TABLE' type,
- table_catalog, table_name,
+ select
+ 'TABLE' type,
+ current_database() as DB,
+ table_name,
(select column_name from information_schema.columns isc where isc.table_catalog=ist.table_catalog and isc.table_schema=ist.table_schema and
isc.table_name=ist.table_name and ordinal_position=1) col1,
@@ -630,5 +636,6 @@
"""
select 'PK',
- table_catalog, table_name,
+ current_database() as DB,
+ table_name,
(select column_name from information_schema.key_column_usage isc where isc.table_catalog=ist.table_catalog and isc.table_schema=ist.table_schema and
isc.table_name=ist.table_name and isc.constraint_name=ist.constraint_name and isc.ordinal_position=1) col1,
@@ -654,24 +661,20 @@
""",
"""
- select 'FK', tco.table_catalog, kcu.table_name as foreign_table,
- rel_tco.table_name as primary_table,
- string_agg(kcu.column_name, ', ') as fk_columns,
- string_agg(kcu2.column_name, ', ') as pk_columns
- from information_schema.table_constraints tco
- join information_schema.key_column_usage kcu
- on (tco.constraint_schema,tco.constraint_name) = (kcu.constraint_schema,kcu.constraint_name)
- join information_schema.key_column_usage kcu2
- on (kcu.constraint_schema,kcu.constraint_name,kcu.ordinal_position) = (kcu2.constraint_schema,kcu2.constraint_name,kcu2.ordinal_position)
- join information_schema.referential_constraints rco
- on (tco.constraint_schema,tco.constraint_name) = (rco.constraint_schema,rco.constraint_name)
- join information_schema.table_constraints rel_tco
- on (rco.unique_constraint_schema,rco.unique_constraint_name) = (rel_tco.constraint_schema,rel_tco.constraint_name)
- where tco.constraint_type = 'FOREIGN KEY' and tco.table_schema=?
- group by tco.table_catalog, kcu.table_schema, kcu.table_name, kcu2.table_schema, kcu2.table_name,
- rel_tco.table_name, rel_tco.table_schema, kcu.constraint_name, kcu2.constraint_name
- order by kcu.table_schema, kcu.table_name
+ SELECT 'FK',
+ current_database() as DB,
+ conrelid::regclass AS table_from,
+ confrelid::regclass as table_to,
+ regexp_replace(pg_get_constraintdef(oid), '^FOREIGN KEY (.*) REFERENCES .*$', '\\1') foreign_key_columns,
+ regexp_replace(pg_get_constraintdef(oid), '^.*REFERENCES (.*).*$', '\\1') primary_key_columns
+ FROM pg_catalog.pg_constraint pc
+ WHERE pc.contype IN ('f')
+ AND pc.connamespace=?::regnamespace
+ ORDER BY 1,2,3
""",
"""
- select 'NN',table_catalog, table_name, column_name
+ select 'NN',
+ current_database() as DB,
+ table_name,
+ column_name
from information_schema.columns where is_nullable='NO' and table_schema=?
order by table_catalog, table_name;
@@ -712,5 +715,5 @@
"""
SELECT 'UK',
- current_database() baza,
+ current_database() as DB,
source_table::regclass,
source_attr1.attname AS source_col1,
@@ -744,5 +747,8 @@
""",
"""
- select 'DATA', table_catalog, c.table_name, 0 as broj
+ select 'DATA',
+ current_database() as DB,
+ c.table_name,
+ 0 as broj
from information_schema.tables c
where
@@ -815,5 +821,5 @@
}
l[5] = countResults.get(0)[2];
- logger.info("{} {} {} {} ", query, countResults.get(0)[0], countResults.get(0)[1],
+ logger.debug("{} {} {} {} ", query, countResults.get(0)[0], countResults.get(0)[1],
countResults.get(0)[2]);
}
Index: dbLearnStar-webApp/src/main/resources/META-INF/assets/SubmissionEvaluations.css
===================================================================
--- dbLearnStar-webApp/src/main/resources/META-INF/assets/SubmissionEvaluations.css (revision 098436bddd5c32eb21cd934a091b07987f31b6a8)
+++ dbLearnStar-webApp/src/main/resources/META-INF/assets/SubmissionEvaluations.css (revision 6f7196682564b7aa4b11e7226b1b57eb3ea849cb)
@@ -164,13 +164,11 @@
}
-.modal-dialog {
- width: 95%;
- max-width: 95%;
-}
-
#solution {
min-height: 20em;
}
+.modal #solution {
+ min-height: 50em !important;
+}
.nonSqlSolution .code {
white-space: pre-wrap;
@@ -205,2 +203,25 @@
padding:0.1em;
}
+
+
+/* fullscreen modal */
+.modal {
+ padding: 0 !important;
+}
+
+.modal .modal-dialog {
+ width: 100%;
+ max-width: none;
+ height: 100%;
+ margin: 0;
+}
+
+.modal .modal-content {
+ height: 100%;
+ border: 0;
+ border-radius: 0;
+}
+
+.modal .modal-body {
+ overflow-y: auto;
+}
Index: dbLearnStar-webApp/src/main/resources/dblearnstar/webapp/pages/ComplaintsAndDiscussions.tml
===================================================================
--- dbLearnStar-webApp/src/main/resources/dblearnstar/webapp/pages/ComplaintsAndDiscussions.tml (revision 098436bddd5c32eb21cd934a091b07987f31b6a8)
+++ dbLearnStar-webApp/src/main/resources/dblearnstar/webapp/pages/ComplaintsAndDiscussions.tml (revision 6f7196682564b7aa4b11e7226b1b57eb3ea849cb)
@@ -34,6 +34,5 @@