Skip to content

Commit

Permalink
Исправления и оптимизации:
Browse files Browse the repository at this point in the history 
 - вылет при двойном клике в таблице картриджей;
 - таблица картриджей на вкладке Ремонты: если пользователь неспеша выделяет картриджи по одному с использованием Ctrl, то иногда выделенные строки сбрасываются;
 - если нажатие на строку происходит в момент обновления таблицы, то строка выделится с заметной задержкой (реализована приостановка обновления при нажатых клавишах Ctrl или Shift).
 - выбор строк на вкладке Ремонты работает неправильно при использовании Shift: если в процессе выбора произошло автообновление, то текущий индекс таблицы устанавливается в 0 и при следующем клике мышью выделяются все строки от нулевой;
 - удалены лишние части кода, предназначенные для сохранения положения таблиц ремонтов/картриджей.
  • Loading branch information
@solderercb
solderercb committed Apr 25, 2024
1 parent 0eb254b commit 9e72122
Show file tree
Hide file tree
Showing 9 changed files with 109 additions and 87 deletions.
2 changes: 1 addition & 1 deletion appver.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#define APP_MAJOR 0
#define APP_MINOR 0
#define APP_PATCH 0
#define APP_COMMIT 291
#define APP_COMMIT 293

#define FILE_VER APP_MAJOR,APP_MINOR,APP_PATCH,APP_COMMIT // обязательно запятые!
#define PRODUCT_VER FILE_VER
Expand Down
88 changes: 44 additions & 44 deletions lang/snap_ru_RU.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -998,21 +998,21 @@
<message>
<location filename="../widgets/scartridgeform.ui" line="429"/>
<location filename="../widgets/scartridgeform.ui" line="464"/>
<location filename="../widgets/scartridgeform.cpp" line="359"/>
<location filename="../widgets/scartridgeform.cpp" line="363"/>
<source>Фотовал</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../widgets/scartridgeform.ui" line="480"/>
<location filename="../widgets/scartridgeform.ui" line="677"/>
<location filename="../widgets/scartridgeform.cpp" line="354"/>
<location filename="../widgets/scartridgeform.cpp" line="358"/>
<source>Чип</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../widgets/scartridgeform.ui" line="629"/>
<location filename="../widgets/scartridgeform.ui" line="864"/>
<location filename="../widgets/scartridgeform.cpp" line="364"/>
<location filename="../widgets/scartridgeform.cpp" line="368"/>
<source>Ракель</source>
<translation type="unfinished"></translation>
</message>
Expand Down Expand Up @@ -1064,59 +1064,59 @@
<message>
<location filename="../widgets/scartridgeform.ui" line="832"/>
<location filename="../widgets/scartridgeform.ui" line="896"/>
<location filename="../widgets/scartridgeform.cpp" line="349"/>
<location filename="../widgets/scartridgeform.cpp" line="353"/>
<source>Заправка</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../widgets/scartridgeform.cpp" line="213"/>
<location filename="../widgets/scartridgeform.cpp" line="214"/>
<source>Повтор</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../widgets/scartridgeform.cpp" line="216"/>
<location filename="../widgets/scartridgeform.cpp" line="217"/>
<source>Гарантия</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../widgets/scartridgeform.cpp" line="669"/>
<location filename="../widgets/scartridgeform.cpp" line="673"/>
<source>Статус информирования клиента обновлён</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../widgets/scartridgeform.cpp" line="781"/>
<location filename="../widgets/scartridgeform.cpp" line="785"/>
<source>Ошибка</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../widgets/scartridgeform.cpp" line="782"/>
<location filename="../widgets/scartridgeform.cpp" line="786"/>
<source>Кол-во больше наличия, списание не возможно</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../widgets/scartridgeform.cpp" line="1017"/>
<location filename="../widgets/scartridgeform.cpp" line="1021"/>
<source>Информация</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../widgets/scartridgeform.cpp" line="1017"/>
<location filename="../widgets/scartridgeform.cpp" line="1021"/>
<source>Проверьте права доступа или обратитесь к администратору</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../widgets/scartridgeform.cpp" line="1066"/>
<location filename="../widgets/scartridgeform.cpp" line="1070"/>
<source>Примечание сохранено</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../widgets/scartridgeform.cpp" line="669"/>
<location filename="../widgets/scartridgeform.cpp" line="1066"/>
<location filename="../widgets/scartridgeform.h" line="114"/>
<location filename="../widgets/scartridgeform.cpp" line="673"/>
<location filename="../widgets/scartridgeform.cpp" line="1070"/>
<location filename="../widgets/scartridgeform.h" line="115"/>
<source>Успешно</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../widgets/scartridgeform.h" line="114"/>
<location filename="../widgets/scartridgeform.h" line="115"/>
<source>Данные сохранены</source>
<translation type="unfinished"></translation>
</message>
Expand Down Expand Up @@ -4381,32 +4381,32 @@ p, li { white-space: pre-wrap; }
<context>
<name>STableViewBase</name>
<message>
<location filename="../widgets/stableviewbase.cpp" line="513"/>
<location filename="../widgets/stableviewbase.cpp" line="511"/>
<source>Автоширина</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../widgets/stableviewbase.cpp" line="519"/>
<location filename="../widgets/stableviewbase.cpp" line="517"/>
<source>Размер по содержимому</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../widgets/stableviewbase.cpp" line="524"/>
<location filename="../widgets/stableviewbase.cpp" line="522"/>
<source>Вписать все</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../widgets/stableviewbase.cpp" line="529"/>
<location filename="../widgets/stableviewbase.cpp" line="527"/>
<source>Сделать значением по умолчанию</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../widgets/stableviewbase.cpp" line="534"/>
<location filename="../widgets/stableviewbase.cpp" line="532"/>
<source>Скрыть</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../widgets/stableviewbase.cpp" line="540"/>
<location filename="../widgets/stableviewbase.cpp" line="538"/>
<source>Выбрать столбцы</source>
<translation type="unfinished"></translation>
</message>
Expand Down Expand Up @@ -6844,99 +6844,99 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../tabrepair.cpp" line="160"/>
<location filename="../tabrepair.cpp" line="161"/>
<source>Ремонт</source>
<comment>repair tab title</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../tabrepair.cpp" line="167"/>
<location filename="../tabrepair.cpp" line="168"/>
<source>Данные не сохранены</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../tabrepair.cpp" line="167"/>
<location filename="../tabrepair.cpp" line="168"/>
<source>Результат диагностики, согласованная сумма или список работ и деталей не сохранены!
Сохранить перед закрытием?</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../tabrepair.cpp" line="206"/>
<location filename="../tabrepair.cpp" line="207"/>
<source>no permissions</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../tabrepair.cpp" line="321"/>
<location filename="../tabrepair.cpp" line="322"/>
<source>было в другом СЦ</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../tabrepair.cpp" line="323"/>
<location filename="../tabrepair.cpp" line="324"/>
<source>данные не важны</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../tabrepair.cpp" line="325"/>
<location filename="../tabrepair.cpp" line="326"/>
<source>срочный</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../tabrepair.cpp" line="327"/>
<location filename="../tabrepair.cpp" line="328"/>
<source>повтор</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../tabrepair.cpp" line="329"/>
<location filename="../tabrepair.cpp" line="330"/>
<source>гарантия</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../tabrepair.cpp" line="331"/>
<location filename="../tabrepair.cpp" line="332"/>
<source>чек при выдаче</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../tabrepair.cpp" line="333"/>
<location filename="../tabrepair.cpp" line="334"/>
<source>предоплата: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../tabrepair.cpp" line="125"/>
<location filename="../tabrepair.cpp" line="486"/>
<location filename="../tabrepair.cpp" line="711"/>
<location filename="../tabrepair.cpp" line="748"/>
<location filename="../tabrepair.cpp" line="126"/>
<location filename="../tabrepair.cpp" line="487"/>
<location filename="../tabrepair.cpp" line="712"/>
<location filename="../tabrepair.cpp" line="749"/>
<source>Информация</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../tabrepair.cpp" line="711"/>
<location filename="../tabrepair.cpp" line="748"/>
<location filename="../tabrepair.cpp" line="712"/>
<location filename="../tabrepair.cpp" line="749"/>
<source>Проверьте права доступа или обратитесь к администратору</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../tabrepair.cpp" line="483"/>
<location filename="../tabrepair.cpp" line="484"/>
<source>Поле с результатом диагностики не может быть пустым</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../tabrepair.cpp" line="125"/>
<location filename="../tabrepair.cpp" line="126"/>
<source>Не достаточно прав для открытия карточки чужого ремонта</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../tabrepair.cpp" line="484"/>
<location filename="../tabrepair.cpp" line="485"/>
<source>Не установлена согласованная сумма</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../tabrepair.cpp" line="763"/>
<location filename="../tabrepair.cpp" line="764"/>
<location filename="../tabrepair.h" line="101"/>
<source>Успешно</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../tabrepair.cpp" line="763"/>
<location filename="../tabrepair.cpp" line="764"/>
<source>Статус информирования клиента обновлён</source>
<translation type="unfinished"></translation>
</message>
Expand Down
1 change: 1 addition & 0 deletions models/ssqlfetchingmodel.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,7 @@ void SSqlFetchingModel::fetchMore(const QModelIndex &parent)
fetchMore(m_fetchSize, parent);
}

// TODO: реализовать асинхронную загрузку
void SSqlFetchingModel::fetchMore(const int fetchSize, const QModelIndex &parent)
{
if(!canFetchMore(parent))
Expand Down
4 changes: 4 additions & 0 deletions widgets/scartridgeform.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,7 @@ void SCartridgeForm::initWidgets()
ui->pushButtonPreagreedRefill->setChecked(true);
setRefill(true); // почему-то при вызове метода setChecked() слот setRefill() не вызывается
}
m_initDone = 1;
}

/* Натсройка виджетов предварительно согласованных работ
Expand Down Expand Up @@ -293,6 +294,9 @@ bool SCartridgeForm::eventFilter(QObject *watched, QEvent *event)

if(event->type() == QEvent::MouseButtonPress || event->type() == QEvent::MouseButtonDblClick)
{
if(!m_initDone) // Если инициализация моделей и виджетов не выполнена, то обработка событий не должна выполняться
return false;

QPushButton *checkBoxWidget = dynamic_cast<QPushButton*>(watched);
if(checkBoxWidget)
{
Expand Down
1 change: 1 addition & 0 deletions widgets/scartridgeform.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ class SCartridgeForm : public QFrame
int m_prevRepairsCount = 0;
QString m_lineEditStyleSheet = commonLineEditStyleSheet;
QString m_spinBoxStyleSheet = commonSpinBoxStyleSheet;
bool m_initDone = 0;
void updateHeader();
void updateWidgets();
void hideWidgetsOnReceiptForm();
Expand Down
Loading

0 comments on commit 9e72122

Please sign in to comment.