Add step item count by state

Author: Nico-Duduf

src/duqf-app/app-version.h

@@ -3,7 +3,7 @@
 
 #define VERSION_MAJOR 0
 #define VERSION_MINOR 9
-#define VERSION_BUILD 3
+#define VERSION_BUILD 4
 #define VERSION_SUFFIX "Beta"
 
 #define STRINGIFY_VERSION(A, B, C) CONCAT(A, B, C )

src/rameditwidgets/stepeditwidget.cpp

@@ -28,6 +28,10 @@ RamStep *StepEditWidget::step() const
 void StepEditWidget::reInit(RamObject *obj)
 {
     m_step = qobject_cast<RamStep*>( obj );
+
+    while(ui_statesLayout->rowCount() > 0)
+        ui_statesLayout->removeRow(0);
+
     if (m_step)
     {                
         ui_colorSelector->setColor(m_step->color());
@@ -60,6 +64,37 @@ void StepEditWidget::reInit(RamObject *obj)
         }
 
         updateEstimationSuffix();
+
+        RamStep::Type stepType = m_step->type();
+        if (stepType == RamStep::AssetProduction || stepType == RamStep::ShotProduction) {
+            QHash<RamState*, int> states = m_step->stateCount();
+            RamState *noState = Ramses::instance()->noState();
+            DBTableModel *allStates = Ramses::instance()->states();
+            int total = 0;
+            for (int i = 0; i < allStates->count(); i++) {
+                auto s = qobject_cast<RamState*>( allStates->get(i) );
+                if (s->is(noState))
+                    continue;
+                int c = states.value( s, 0 );
+                if (c > 0) {
+                    QString cStr = "<b>"+QString::number(c)+"</b> ";
+                    if (stepType == RamStep::AssetProduction) cStr += "assets";
+                    else cStr += "shots";
+
+                    auto l = new QLabel(s->name(), this);
+                    l->setStyleSheet("QLabel { color: "+s->color().name() + "; }");
+                    ui_statesLayout->addRow( l, new QLabel(cStr, this) );
+                    total += c;
+                }
+            }
+            if (total > 0) {
+                QString cStr = "<b>"+QString::number(total)+"</b> ";
+                if (stepType == RamStep::AssetProduction) cStr += "assets";
+                else cStr += "shots";
+
+                ui_statesLayout->addRow( "Total", new QLabel(cStr, this) );
+            }
+        }
     }
     else
     {
@@ -254,6 +289,14 @@ void StepEditWidget::setupUi()
     ui_estimationWidget->setProperty("class", "duBlock");
     estimLayout->addWidget(ui_estimationWidget);
 
+    estimLayout->addWidget(new QLabel(
+        "<b>"+tr("Status")+"</b>"
+        ));
+
+    ui_statesWidget = new QWidget(ui_tabWidget);
+    ui_statesLayout = new QFormLayout(ui_statesWidget);
+    estimLayout->addWidget(ui_statesWidget);
+
     estimLayout->addStretch(1);
 
     QFormLayout *estimationLayout = new QFormLayout(ui_estimationWidget);

src/rameditwidgets/stepeditwidget.h

@@ -51,6 +51,8 @@ private slots:
 
     DuComboBox *ui_typeBox;
     QWidget *ui_estimationWidget;
+    QWidget *ui_statesWidget;
+    QFormLayout *ui_statesLayout;
     DuComboBox *ui_estimationTypeBox;
     QLabel *ui_estimationTypeLabel;
     DuQFTextEdit *ui_publishSettingsEdit;

src/ramobjects/ramstep.cpp

@@ -179,6 +179,23 @@ float RamStep::neededDays()
     return estimation() - daysSpent();
 }
 
+QHash<RamState *, int> RamStep::stateCount()
+{
+    QHash<RamState *, int> states;
+
+    RamProject *proj = project();
+    if (!proj) return states;
+
+    const QSet<RamStatus*> status = proj->stepStatus(this);
+    for(auto st: status) {
+        RamState *s = st->state();
+        int c = states.value(s, 0);
+        states.insert(s, c+1);
+    }
+
+    return states;
+}
+
 QVector<float> RamStep::stats(RamUser *user)
 {
     float estim = estimation();

src/ramobjects/ramstep.h

@@ -12,6 +12,7 @@ class RamFileType;
 class RamUser;
 class RamWorkingFolder;
 class RamObjectList;
+class RamState;
 
 class RamStep : public RamTemplateStep
 {
@@ -40,6 +41,8 @@ class RamStep : public RamTemplateStep
     float daysSpent() ;
     float neededDays() ;
 
+    QHash<RamState*, int> stateCount();
+
     /**
      * @brief stats
      * @return a list of number of days <estimation, completed, scheduled, scheduled in the future>