Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
OLAT CI-CD Testing Project
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Monitor
Service Desk
Analyze
Contributor analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Lars Oliver Dam
OLAT CI-CD Testing Project
Commits
2df3fa4c
Commit
2df3fa4c
authored
8 years ago
by
srosse
Browse files
Options
Downloads
Patches
Plain Diff
no-jira: catch exception during converssion
parent
6b6f648d
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/main/java/org/olat/upgrade/OLATUpgrade_11_0_0.java
+79
-74
79 additions, 74 deletions
src/main/java/org/olat/upgrade/OLATUpgrade_11_0_0.java
with
79 additions
and
74 deletions
src/main/java/org/olat/upgrade/OLATUpgrade_11_0_0.java
+
79
−
74
View file @
2df3fa4c
...
...
@@ -355,93 +355,98 @@ public class OLATUpgrade_11_0_0 extends OLATUpgrade {
// select count(*) from o_property where name in ('SCORE','PASSED','ATTEMPTS','COMMENT','COACH_COMMENT','ASSESSMENT_ID','FULLY_ASSESSED');
private
boolean
processCourseAssessmentData
(
RepositoryEntry
courseEntry
)
{
final
Long
courseResourceId
=
courseEntry
.
getOlatResource
().
getResourceableId
();
final
ICourse
course
=
CourseFactory
.
loadCourse
(
courseEntry
);
boolean
allOk
=
true
;
try
{
final
Long
courseResourceId
=
courseEntry
.
getOlatResource
().
getResourceableId
();
final
ICourse
course
=
CourseFactory
.
loadCourse
(
courseEntry
);
//load all assessable identities
List
<
Identity
>
assessableIdentities
=
getAllAssessableIdentities
(
course
,
courseEntry
);
//load all assessable identities
List
<
Identity
>
assessableIdentities
=
getAllAssessableIdentities
(
course
,
courseEntry
);
Map
<
AssessmentDataKey
,
AssessmentEntryImpl
>
curentNodeAssessmentMap
=
new
HashMap
<>();
{
//load already migrated data
List
<
AssessmentEntryImpl
>
currentNodeAssessmentList
=
loadAssessmentEntries
(
courseEntry
);
for
(
AssessmentEntryImpl
currentNodeAssessment:
currentNodeAssessmentList
)
{
AssessmentDataKey
key
=
new
AssessmentDataKey
(
currentNodeAssessment
.
getIdentity
().
getKey
(),
courseResourceId
,
currentNodeAssessment
.
getSubIdent
());
curentNodeAssessmentMap
.
put
(
key
,
currentNodeAssessment
);
Map
<
AssessmentDataKey
,
AssessmentEntryImpl
>
curentNodeAssessmentMap
=
new
HashMap
<>();
{
//load already migrated data
List
<
AssessmentEntryImpl
>
currentNodeAssessmentList
=
loadAssessmentEntries
(
courseEntry
);
for
(
AssessmentEntryImpl
currentNodeAssessment:
currentNodeAssessmentList
)
{
AssessmentDataKey
key
=
new
AssessmentDataKey
(
currentNodeAssessment
.
getIdentity
().
getKey
(),
courseResourceId
,
currentNodeAssessment
.
getSubIdent
());
curentNodeAssessmentMap
.
put
(
key
,
currentNodeAssessment
);
}
}
}
Map
<
AssessmentDataKey
,
AssessmentEntryImpl
>
nodeAssessmentMap
=
new
HashMap
<>();
{
//processed properties
List
<
Property
>
courseProperties
=
loadAssessmentProperties
(
courseEntry
);
for
(
Property
property:
courseProperties
)
{
String
propertyCategory
=
property
.
getCategory
();
if
(
StringHelper
.
containsNonWhitespace
(
propertyCategory
))
{
int
nodeIdentIndex
=
propertyCategory
.
indexOf
(
"::"
);
if
(
nodeIdentIndex
>
0
)
{
String
nodeIdent
=
propertyCategory
.
substring
(
propertyCategory
.
indexOf
(
"::"
)
+
2
);
AssessmentDataKey
key
=
new
AssessmentDataKey
(
property
.
getIdentity
().
getKey
(),
property
.
getResourceTypeId
(),
nodeIdent
);
if
(
curentNodeAssessmentMap
.
containsKey
(
key
))
{
continue
;
}
AssessmentEntryImpl
nodeAssessment
;
if
(
nodeAssessmentMap
.
containsKey
(
key
))
{
nodeAssessment
=
nodeAssessmentMap
.
get
(
key
);
if
(
nodeAssessment
.
getCreationDate
().
after
(
property
.
getCreationDate
()))
{
nodeAssessment
.
setCreationDate
(
property
.
getCreationDate
());
Map
<
AssessmentDataKey
,
AssessmentEntryImpl
>
nodeAssessmentMap
=
new
HashMap
<>();
{
//processed properties
List
<
Property
>
courseProperties
=
loadAssessmentProperties
(
courseEntry
);
for
(
Property
property:
courseProperties
)
{
String
propertyCategory
=
property
.
getCategory
();
if
(
StringHelper
.
containsNonWhitespace
(
propertyCategory
))
{
int
nodeIdentIndex
=
propertyCategory
.
indexOf
(
"::"
);
if
(
nodeIdentIndex
>
0
)
{
String
nodeIdent
=
propertyCategory
.
substring
(
propertyCategory
.
indexOf
(
"::"
)
+
2
);
AssessmentDataKey
key
=
new
AssessmentDataKey
(
property
.
getIdentity
().
getKey
(),
property
.
getResourceTypeId
(),
nodeIdent
);
if
(
curentNodeAssessmentMap
.
containsKey
(
key
))
{
continue
;
}
if
(
nodeAssessment
.
getLastModified
().
before
(
property
.
getLastModified
()))
{
nodeAssessment
.
setLastModified
(
property
.
getLastModified
());
AssessmentEntryImpl
nodeAssessment
;
if
(
nodeAssessmentMap
.
containsKey
(
key
))
{
nodeAssessment
=
nodeAssessmentMap
.
get
(
key
);
if
(
nodeAssessment
.
getCreationDate
().
after
(
property
.
getCreationDate
()))
{
nodeAssessment
.
setCreationDate
(
property
.
getCreationDate
());
}
if
(
nodeAssessment
.
getLastModified
().
before
(
property
.
getLastModified
()))
{
nodeAssessment
.
setLastModified
(
property
.
getLastModified
());
}
}
else
{
nodeAssessment
=
createAssessmentEntry
(
property
.
getIdentity
(),
property
,
course
,
courseEntry
,
nodeIdent
);
}
}
else
{
nodeAssessment
=
createAssessmentEntry
(
property
.
getIdentity
(),
property
,
course
,
courseEntry
,
nodeId
ent
);
copyAssessmentProperty
(
property
,
nodeAssessment
,
course
);
nodeAssessment
Map
.
put
(
key
,
nodeAssessm
ent
);
}
copyAssessmentProperty
(
property
,
nodeAssessment
,
course
);
nodeAssessmentMap
.
put
(
key
,
nodeAssessment
);
}
}
}
}
//check the transient qti ser
CourseNode
rootNode
=
course
.
getRunStructure
().
getRootNode
();
new
TreeVisitor
(
new
Visitor
()
{
@Override
public
void
visit
(
INode
node
)
{
if
(
node
instanceof
AssessableCourseNode
)
{
processNonPropertiesStates
(
assessableIdentities
,
(
AssessableCourseNode
)
node
,
course
,
courseEntry
,
nodeAssessmentMap
,
curentNodeAssessmentMap
);
}
}
}
},
rootNode
,
true
).
visitAll
();
dbInstance
.
commitAndCloseSession
();
int
count
=
0
;
for
(
AssessmentEntryImpl
courseNodeAssessment:
nodeAssessmentMap
.
values
())
{
dbInstance
.
getCurrentEntityManager
().
persist
(
courseNodeAssessment
);
if
(++
count
%
50
==
0
)
{
dbInstance
.
commit
();
}
}
dbInstance
.
commitAndCloseSession
();
boolean
allOk
=
verifyCourseAssessmentData
(
assessableIdentities
,
courseEntry
);
dbInstance
.
commitAndCloseSession
();
if
(
allOk
)
{
List
<
STCourseNode
>
nodes
=
hasAssessableSTCourseNode
(
course
);
if
(
nodes
.
size
()
>
0
)
{
log
.
info
(
"Has assessables ST nodes"
);
for
(
Identity
identity:
assessableIdentities
)
{
IdentityEnvironment
identityEnv
=
new
IdentityEnvironment
(
identity
,
null
);
UserCourseEnvironmentImpl
userCourseEnv
=
new
UserCourseEnvironmentImpl
(
identityEnv
,
course
.
getCourseEnvironment
());
userCourseEnv
.
getScoreAccounting
().
evaluateAll
(
true
);
//check the transient qti ser
CourseNode
rootNode
=
course
.
getRunStructure
().
getRootNode
();
new
TreeVisitor
(
new
Visitor
()
{
@Override
public
void
visit
(
INode
node
)
{
if
(
node
instanceof
AssessableCourseNode
)
{
processNonPropertiesStates
(
assessableIdentities
,
(
AssessableCourseNode
)
node
,
course
,
courseEntry
,
nodeAssessmentMap
,
curentNodeAssessmentMap
);
}
}
},
rootNode
,
true
).
visitAll
();
dbInstance
.
commitAndCloseSession
();
int
count
=
0
;
for
(
AssessmentEntryImpl
courseNodeAssessment:
nodeAssessmentMap
.
values
())
{
dbInstance
.
getCurrentEntityManager
().
persist
(
courseNodeAssessment
);
if
(++
count
%
50
==
0
)
{
dbInstance
.
commit
();
}
}
dbInstance
.
commitAndCloseSession
();
allOk
=
verifyCourseAssessmentData
(
assessableIdentities
,
courseEntry
);
dbInstance
.
commitAndCloseSession
();
if
(
allOk
)
{
List
<
STCourseNode
>
nodes
=
hasAssessableSTCourseNode
(
course
);
if
(
nodes
.
size
()
>
0
)
{
log
.
info
(
"Has assessables ST nodes"
);
for
(
Identity
identity:
assessableIdentities
)
{
IdentityEnvironment
identityEnv
=
new
IdentityEnvironment
(
identity
,
null
);
UserCourseEnvironmentImpl
userCourseEnv
=
new
UserCourseEnvironmentImpl
(
identityEnv
,
course
.
getCourseEnvironment
());
userCourseEnv
.
getScoreAccounting
().
evaluateAll
(
true
);
dbInstance
.
commit
();
}
}
}
}
catch
(
Exception
e
)
{
log
.
error
(
""
,
e
);
}
return
allOk
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment