mirror of
https://gitea.msk.dinamika-avia.ru/Constanta-Design/RRJClient.git
synced 2026-03-28 05:25:39 +03:00
feat: add scenario conflict resolver
This commit is contained in:
@@ -16,10 +16,23 @@ void UpdateFileSlot::fill(QString itemName, FileData serverData, FileData localD
|
||||
ui->Path->setText(itemName);
|
||||
local = localData;
|
||||
|
||||
bool haveData = serverData.lastUpdate != "нет";
|
||||
|
||||
QString result = " Сервер: ";
|
||||
QDateTime serverFileTime = QDateTime::fromString(serverData.lastUpdate,"dd.MM.yyyy hh:mm:ss");
|
||||
|
||||
QDateTime serverFileTime;
|
||||
if (haveData)
|
||||
{
|
||||
serverFileTime = QDateTime::fromString(serverData.lastUpdate,"dd.MM.yyyy hh:mm:ss");
|
||||
result.append(serverFileTime.toString("dd.MM.yyyy"));
|
||||
}
|
||||
else
|
||||
{
|
||||
result.append("НЕТ");
|
||||
}
|
||||
|
||||
QDateTime localFileTime = QDateTime::fromString(localData.lastUpdate,"dd.MM.yyyy hh:mm:ss");
|
||||
result.append(serverFileTime.toString("dd.MM.yyyy"));
|
||||
|
||||
result.append(" Локально: ");
|
||||
result.append(localFileTime.toString("dd.MM.yyyy"));
|
||||
ui->Dates->setText(result);
|
||||
|
||||
Reference in New Issue
Block a user