diff --git a/DB_IaT/InstructorsAndTrainees/docTasks/fimtaskswidget.cpp b/DB_IaT/InstructorsAndTrainees/docTasks/fimtaskswidget.cpp
index 1e30cce..9aff7d2 100644
--- a/DB_IaT/InstructorsAndTrainees/docTasks/fimtaskswidget.cpp
+++ b/DB_IaT/InstructorsAndTrainees/docTasks/fimtaskswidget.cpp
@@ -60,48 +60,45 @@ void FIMtasksWidget::loadTasksAmmFimFromXML()
nodeMap.namedItem("changed").nodeValue());
QDomElement malfunctionElement = taskElement.firstChildElement();
- if(malfunctionElement.isNull())
- break;
+ if(!malfunctionElement.isNull())
+ {
+ do
+ {/*malfunction*/
+ QString name = malfunctionElement.nodeName();
+ QDomNamedNodeMap nodeMap = malfunctionElement.attributes();
- do
- {/*malfunction*/
- QString name = malfunctionElement.nodeName();
- QDomNamedNodeMap nodeMap = malfunctionElement.attributes();
+ if(name == "malfunction")
+ {
+ Malfunction malfunction;
- if(name == "malfunction")
- {
- Malfunction malfunction;
+ malfunction.initialize(nodeMap.namedItem("dmCode").nodeValue(),
+ nodeMap.namedItem("num").nodeValue(),
+ nodeMap.namedItem("description").nodeValue());
- malfunction.initialize(nodeMap.namedItem("dmCode").nodeValue(),
- nodeMap.namedItem("num").nodeValue(),
- nodeMap.namedItem("description").nodeValue());
-
- QDomElement signElement = malfunctionElement.firstChildElement();
- if(signElement.isNull())
- break;
-
- do
- {/*malfunctionSign*/
- QString name = signElement.nodeName();
- QDomNamedNodeMap nodeMap = signElement.attributes();
-
- if(name == "malfunctionSign")
+ QDomElement signElement = malfunctionElement.firstChildElement();
+ if(!signElement.isNull())
{
- MalfunctionSign sign;
+ do
+ {/*malfunctionSign*/
+ QString name = signElement.nodeName();
+ QDomNamedNodeMap nodeMap = signElement.attributes();
- sign.initialize(nodeMap.namedItem("type").nodeValue().toInt(),
- nodeMap.namedItem("description").nodeValue());
+ if(name == "malfunctionSign")
+ {
+ MalfunctionSign sign;
- malfunction.addMalfunctionSign(sign);
+ sign.initialize(nodeMap.namedItem("type").nodeValue().toInt(),
+ nodeMap.namedItem("description").nodeValue());
+
+ malfunction.addMalfunctionSign(sign);
+ }
+
+ }while(! (signElement = signElement.nextSiblingElement()).isNull());
}
-
- }while(! (signElement = signElement.nextSiblingElement()).isNull());
-
- task.addMalfunction(malfunction);
- }
-
- }while(! (malfunctionElement = malfunctionElement.nextSiblingElement()).isNull());
-
+ task.addMalfunction(malfunction);
+ }
+ }while(! (malfunctionElement = malfunctionElement.nextSiblingElement()).isNull());
+ }
listTaskAmmFim.append(task);
}
}while (! (taskElement = taskElement.nextSiblingElement()).isNull());
@@ -118,5 +115,5 @@ void FIMtasksWidget::updateListWidget()
void FIMtasksWidget::addTaskFimToListWidget(TaskAmmFim taskFim)
{
-
+ ui->listWidgetTasks->addItem(taskFim.title);
}
diff --git a/DB_IaT/InstructorsAndTrainees/instructorsandtraineeswidget.cpp b/DB_IaT/InstructorsAndTrainees/instructorsandtraineeswidget.cpp
index 1a66ac1..f4ca390 100644
--- a/DB_IaT/InstructorsAndTrainees/instructorsandtraineeswidget.cpp
+++ b/DB_IaT/InstructorsAndTrainees/instructorsandtraineeswidget.cpp
@@ -12,6 +12,7 @@ InstructorsAndTraineesWidget::InstructorsAndTraineesWidget(QWidget *parent) :
viewerInstructors(nullptr),
messangerWidget(nullptr),
docTasksWidget(nullptr),
+ fIMtasksWidget(nullptr),
adminMode(false),
loginInstructorLoggedInLocal(QStringLiteral("")),
nameInstructorLoggedInLocal(QStringLiteral(""))
@@ -79,6 +80,7 @@ InstructorsAndTraineesWidget::~InstructorsAndTraineesWidget()
deAuthorizationInstructor(loginInstructorLoggedInLocal);
delete docTasksWidget;
+ delete fIMtasksWidget;
delete messangerWidget;
delete viewerInstructors;
delete viewerTrainees;
@@ -119,7 +121,8 @@ void InstructorsAndTraineesWidget::updateMyStyleSheet()
QString InstructorsAndTraineesWidget::loadStyleSheet()
{
- QString fileName = ":/resources/css/styleSheetMain.css";
+ //QString fileName = ":/resources/css/styleSheetMain.css";
+ QString fileName = "./resources/css/styleSheetMain.css";
QFile styleSheetFile(fileName);
if (!styleSheetFile.open(QFile::ReadOnly | QFile::Text))
{
diff --git a/GUIdataBaseLMS/GUIdataBaseLMS/StaticData/authData.xml b/GUIdataBaseLMS/GUIdataBaseLMS/StaticData/authData.xml
new file mode 100644
index 0000000..69f75cd
--- /dev/null
+++ b/GUIdataBaseLMS/GUIdataBaseLMS/StaticData/authData.xml
@@ -0,0 +1,2 @@
+
+
\ No newline at end of file
diff --git a/GUIdataBaseLMS/GUIdataBaseLMS/StaticData/settings.xml b/GUIdataBaseLMS/GUIdataBaseLMS/StaticData/settings.xml
new file mode 100644
index 0000000..9aafbf5
--- /dev/null
+++ b/GUIdataBaseLMS/GUIdataBaseLMS/StaticData/settings.xml
@@ -0,0 +1,4 @@
+
+
+
+
diff --git a/GUIdataBaseLMS/GUIdataBaseLMS/StaticData/temp.xml b/GUIdataBaseLMS/GUIdataBaseLMS/StaticData/temp.xml
new file mode 100644
index 0000000..40e39ea
--- /dev/null
+++ b/GUIdataBaseLMS/GUIdataBaseLMS/StaticData/temp.xml
@@ -0,0 +1,2 @@
+
+