new branch

This commit is contained in:
krivoshein
2024-11-27 09:51:01 +03:00
parent ce4e3e0a95
commit b94bc4764e
53 changed files with 16860 additions and 503 deletions

View File

@@ -1235,7 +1235,7 @@
}
],
"type" : "STATIC",
"value" : "general;Qt5::Widgets;general;Qt5::Sql;general;libDataBaseLMS.dll;"
"value" : "general;Qt5::Widgets;general;Qt5::Sql;general;Qt5::Xml;general;libDataBaseLMS.dll;"
},
{
"name" : "InstructorsAndTrainees_SOURCE_DIR",

View File

@@ -328,6 +328,26 @@
"isExternal" : true,
"path" : "C:/msys64/mingw64/share/cmake/Modules/CMakeParseArguments.cmake"
},
{
"isExternal" : true,
"path" : "C:/Qt/Qt5.14.2/5.14.2/mingw73_64/lib/cmake/Qt5/Qt5ConfigVersion.cmake"
},
{
"isExternal" : true,
"path" : "C:/Qt/Qt5.14.2/5.14.2/mingw73_64/lib/cmake/Qt5/Qt5Config.cmake"
},
{
"isExternal" : true,
"path" : "C:/Qt/Qt5.14.2/5.14.2/mingw73_64/lib/cmake/Qt5/Qt5ModuleLocation.cmake"
},
{
"isExternal" : true,
"path" : "C:/Qt/Qt5.14.2/5.14.2/mingw73_64/lib/cmake/Qt5Xml/Qt5XmlConfigVersion.cmake"
},
{
"isExternal" : true,
"path" : "C:/Qt/Qt5.14.2/5.14.2/mingw73_64/lib/cmake/Qt5Xml/Qt5XmlConfig.cmake"
},
{
"path" : "resources.qrc"
}

View File

@@ -41,7 +41,7 @@
{
"directoryIndex" : 0,
"id" : "InstructorsAndTrainees::@6890427a1f51a3e7e1df",
"jsonFile" : "target-InstructorsAndTrainees-Debug-02530981d8311d7ad043.json",
"jsonFile" : "target-InstructorsAndTrainees-Debug-6cd9332aee539bb4baa2.json",
"name" : "InstructorsAndTrainees",
"projectIndex" : 0
},

View File

@@ -26,7 +26,7 @@
"objects" :
[
{
"jsonFile" : "codemodel-v2-ce6dd098cc633bc27cb5.json",
"jsonFile" : "codemodel-v2-ee058348dcc2f9dd59c9.json",
"kind" : "codemodel",
"version" :
{
@@ -35,7 +35,7 @@
}
},
{
"jsonFile" : "cache-v2-97bdeb556923d586e80b.json",
"jsonFile" : "cache-v2-9e3463ee0d1552a2413b.json",
"kind" : "cache",
"version" :
{
@@ -44,7 +44,7 @@
}
},
{
"jsonFile" : "cmakeFiles-v1-1dce5a530fe2973318d4.json",
"jsonFile" : "cmakeFiles-v1-09d5bc4242235eb7aac3.json",
"kind" : "cmakeFiles",
"version" :
{
@@ -57,7 +57,7 @@
{
"cache-v2" :
{
"jsonFile" : "cache-v2-97bdeb556923d586e80b.json",
"jsonFile" : "cache-v2-9e3463ee0d1552a2413b.json",
"kind" : "cache",
"version" :
{
@@ -67,7 +67,7 @@
},
"cmakeFiles-v1" :
{
"jsonFile" : "cmakeFiles-v1-1dce5a530fe2973318d4.json",
"jsonFile" : "cmakeFiles-v1-09d5bc4242235eb7aac3.json",
"kind" : "cmakeFiles",
"version" :
{
@@ -77,7 +77,7 @@
},
"codemodel-v2" :
{
"jsonFile" : "codemodel-v2-ce6dd098cc633bc27cb5.json",
"jsonFile" : "codemodel-v2-ee058348dcc2f9dd59c9.json",
"kind" : "codemodel",
"version" :
{

View File

@@ -40,31 +40,37 @@
{
"command" : 0,
"file" : 0,
"line" : 24,
"line" : 25,
"parent" : 0
},
{
"command" : 1,
"file" : 0,
"line" : 87,
"parent" : 0
},
{
"command" : 2,
"file" : 0,
"line" : 78,
"parent" : 0
},
{
"command" : 2,
"file" : 0,
"line" : 79,
"parent" : 0
},
{
"command" : 2,
"file" : 0,
"line" : 71,
"line" : 80,
"parent" : 0
},
{
"command" : 2,
"file" : 0,
"line" : 72,
"parent" : 0
},
{
"command" : 2,
"file" : 0,
"line" : 83,
"line" : 91,
"parent" : 0
},
{
@@ -75,34 +81,34 @@
},
{
"file" : 2,
"parent" : 6
"parent" : 7
},
{
"command" : 5,
"file" : 2,
"line" : 28,
"parent" : 7
"parent" : 8
},
{
"file" : 1,
"parent" : 8
"parent" : 9
},
{
"command" : 4,
"file" : 1,
"line" : 185,
"parent" : 9
"parent" : 10
},
{
"command" : 3,
"file" : 1,
"line" : 45,
"parent" : 10
"parent" : 11
},
{
"command" : 6,
"file" : 0,
"line" : 74,
"line" : 82,
"parent" : 0
},
{
@@ -114,25 +120,31 @@
{
"command" : 8,
"file" : 0,
"line" : 67,
"line" : 73,
"parent" : 0
},
{
"command" : 8,
"file" : 0,
"line" : 68,
"line" : 74,
"parent" : 0
},
{
"command" : 8,
"file" : 0,
"line" : 69,
"line" : 75,
"parent" : 0
},
{
"command" : 8,
"file" : 0,
"line" : 77,
"line" : 76,
"parent" : 0
},
{
"command" : 8,
"file" : 0,
"line" : 85,
"parent" : 0
}
]
@@ -149,14 +161,14 @@
"defines" :
[
{
"backtrace" : 12,
"backtrace" : 13,
"define" : "INSTRUCTORSANDTRAINEES_LIBRARY"
},
{
"define" : "InstructorsAndTrainees_EXPORTS"
},
{
"backtrace" : 13,
"backtrace" : 14,
"define" : "PROJECT_TYPE_DEBUG"
},
{
@@ -174,6 +186,10 @@
{
"backtrace" : 3,
"define" : "QT_WIDGETS_LIB"
},
{
"backtrace" : 5,
"define" : "QT_XML_LIB"
}
],
"includes" :
@@ -189,19 +205,23 @@
"path" : "D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include"
},
{
"backtrace" : 14,
"backtrace" : 15,
"path" : "D:/LMS/DB_IaT/InstructorsAndTrainees/instructors"
},
{
"backtrace" : 15,
"backtrace" : 16,
"path" : "D:/LMS/DB_IaT/InstructorsAndTrainees/trainees"
},
{
"backtrace" : 16,
"backtrace" : 17,
"path" : "D:/LMS/DB_IaT/InstructorsAndTrainees/tasks"
},
{
"backtrace" : 17,
"backtrace" : 18,
"path" : "D:/LMS/DB_IaT/InstructorsAndTrainees/docTasks"
},
{
"backtrace" : 19,
"path" : "D:/LMS/DB_IaT/InstructorsAndTrainees/../../DB_LMS/DataBaseLMS"
},
{
@@ -238,6 +258,11 @@
"backtrace" : 4,
"isSystem" : true,
"path" : "C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtSql"
},
{
"backtrace" : 5,
"isSystem" : true,
"path" : "C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtXml"
}
],
"language" : "CXX",
@@ -266,7 +291,9 @@
32,
35,
37,
51
40,
43,
57
]
}
],
@@ -303,16 +330,21 @@
},
{
"backtrace" : 5,
"fragment" : "C:\\Qt\\Qt5.14.2\\5.14.2\\mingw73_64\\lib\\libQt5Xml.a",
"role" : "libraries"
},
{
"backtrace" : 6,
"fragment" : "-lDataBaseLMS",
"role" : "libraries"
},
{
"backtrace" : 11,
"backtrace" : 12,
"fragment" : "C:\\Qt\\Qt5.14.2\\5.14.2\\mingw73_64\\lib\\libQt5Gui.a",
"role" : "libraries"
},
{
"backtrace" : 11,
"backtrace" : 12,
"fragment" : "C:\\Qt\\Qt5.14.2\\5.14.2\\mingw73_64\\lib\\libQt5Core.a",
"role" : "libraries"
},
@@ -351,7 +383,9 @@
32,
35,
37,
51
40,
43,
57
]
},
{
@@ -374,15 +408,18 @@
36,
38,
41,
42,
43,
44,
45,
46,
47,
48,
49,
50
50,
51,
52,
53,
54,
55,
56
]
},
{
@@ -399,14 +436,15 @@
31,
34,
39,
40
42,
45
]
},
{
"name" : "CMake Rules",
"sourceIndexes" :
[
52
58
]
}
],
@@ -628,6 +666,33 @@
"path" : "tasks/taskswidget.ui",
"sourceGroupIndex" : 2
},
{
"backtrace" : 1,
"compileGroupIndex" : 0,
"path" : "docTasks/doctaskswidget.cpp",
"sourceGroupIndex" : 0
},
{
"backtrace" : 1,
"path" : "docTasks/doctaskswidget.h",
"sourceGroupIndex" : 1
},
{
"backtrace" : 1,
"path" : "docTasks/doctaskswidget.ui",
"sourceGroupIndex" : 2
},
{
"backtrace" : 1,
"compileGroupIndex" : 0,
"path" : "docTasks/module.cpp",
"sourceGroupIndex" : 0
},
{
"backtrace" : 1,
"path" : "docTasks/module.h",
"sourceGroupIndex" : 1
},
{
"backtrace" : 1,
"path" : "resources.qrc",
@@ -693,6 +758,12 @@
"path" : "D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/tasks/ui_taskswidget.h",
"sourceGroupIndex" : 1
},
{
"backtrace" : 0,
"isGenerated" : true,
"path" : "D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/docTasks/ui_doctaskswidget.h",
"sourceGroupIndex" : 1
},
{
"backtrace" : 0,
"compileGroupIndex" : 0,