|
@@ -65,10 +65,10 @@ namespace TEAMModelOS.Controllers.Both
|
|
|
|
|
|
string code = string.Empty;
|
|
string code = string.Empty;
|
|
Knowledge old = null;
|
|
Knowledge old = null;
|
|
- var blocks = new List<Block>();
|
|
|
|
- var points = new HashSet<string>();
|
|
|
|
|
|
+ //var blocks = new List<Block>();
|
|
|
|
+ //var points = new HashSet<string>();
|
|
var nodes = new List<PointNode>();
|
|
var nodes = new List<PointNode>();
|
|
- KnowledgeService.TreeToList(knowledge.tree, nodes, blocks, points);
|
|
|
|
|
|
+ KnowledgeService.TreeToList(knowledge.tree, nodes);
|
|
if (knowledge.scope.Equals("school"))
|
|
if (knowledge.scope.Equals("school"))
|
|
{
|
|
{
|
|
if (!string.IsNullOrWhiteSpace(knowledge.subjectId) && !string.IsNullOrWhiteSpace(knowledge.periodId))
|
|
if (!string.IsNullOrWhiteSpace(knowledge.subjectId) && !string.IsNullOrWhiteSpace(knowledge.periodId))
|
|
@@ -84,23 +84,23 @@ namespace TEAMModelOS.Controllers.Both
|
|
if (old!=null)
|
|
if (old!=null)
|
|
{
|
|
{
|
|
knowledge.id = old.id;
|
|
knowledge.id = old.id;
|
|
- foreach (var p in old.points) {
|
|
|
|
- points.Add(p);
|
|
|
|
- }
|
|
|
|
- foreach (var b in old.blocks) {
|
|
|
|
- var bks= blocks.FindAll(x => x.name.Equals(b.name));
|
|
|
|
- if (bks.IsNotEmpty())
|
|
|
|
- {
|
|
|
|
- foreach (var bk in bks)
|
|
|
|
- {
|
|
|
|
- bk.points.AddRange(b.points);
|
|
|
|
- bk.points= bk.points.Distinct().ToList();
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
- else {
|
|
|
|
- blocks.Add(b);
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
|
|
+ //foreach (var p in old.points) {
|
|
|
|
+ // points.Add(p);
|
|
|
|
+ //}
|
|
|
|
+ //foreach (var b in old.blocks) {
|
|
|
|
+ // var bks= blocks.FindAll(x => x.name.Equals(b.name));
|
|
|
|
+ // if (bks.IsNotEmpty())
|
|
|
|
+ // {
|
|
|
|
+ // foreach (var bk in bks)
|
|
|
|
+ // {
|
|
|
|
+ // bk.points.AddRange(b.points);
|
|
|
|
+ // bk.points= bk.points.Distinct().ToList();
|
|
|
|
+ // }
|
|
|
|
+ // }
|
|
|
|
+ // else {
|
|
|
|
+ // blocks.Add(b);
|
|
|
|
+ // }
|
|
|
|
+ //}
|
|
}
|
|
}
|
|
else
|
|
else
|
|
{
|
|
{
|
|
@@ -114,9 +114,9 @@ namespace TEAMModelOS.Controllers.Both
|
|
periodId=knowledge.periodId,
|
|
periodId=knowledge.periodId,
|
|
subjectId =knowledge.subjectId,
|
|
subjectId =knowledge.subjectId,
|
|
scope=knowledge.scope,
|
|
scope=knowledge.scope,
|
|
- blocks=blocks,
|
|
|
|
|
|
+ //blocks=blocks,
|
|
pk="Knowledge",
|
|
pk="Knowledge",
|
|
- points=points.ToList(),
|
|
|
|
|
|
+ // points=points.ToList(),
|
|
nodes=nodes,
|
|
nodes=nodes,
|
|
owner=knowledge.owner,
|
|
owner=knowledge.owner,
|
|
};
|
|
};
|
|
@@ -142,9 +142,9 @@ namespace TEAMModelOS.Controllers.Both
|
|
periodId=knowledge.periodId,
|
|
periodId=knowledge.periodId,
|
|
subjectId =knowledge.subjectId,
|
|
subjectId =knowledge.subjectId,
|
|
scope=knowledge.scope,
|
|
scope=knowledge.scope,
|
|
- blocks=blocks,
|
|
|
|
|
|
+ //blocks=blocks,
|
|
pk="Knowledge",
|
|
pk="Knowledge",
|
|
- points=points.ToList(),
|
|
|
|
|
|
+ // points=points.ToList(),
|
|
nodes=nodes,
|
|
nodes=nodes,
|
|
owner=knowledge.owner,
|
|
owner=knowledge.owner,
|
|
};
|
|
};
|