Fix state order

Author: Nico-Duduf

src/rameditwidgets/stepeditwidget.cpp

@@ -67,26 +67,29 @@ void StepEditWidget::reInit(RamObject *obj)
 
         RamStep::Type stepType = m_step->type();
         if (stepType == RamStep::AssetProduction || stepType == RamStep::ShotProduction) {
-            QHash<RamState*, int> states = m_step->stateCount();
+            const QVector<RamStep::StateCount> stateCount = 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))
+
+            for(const auto count: stateCount) {
+                int c = count.count;
+                if (c == 0)
+                    continue;
+
+                RamState *state = count.state;
+                if (state->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;
-                }
+
+                QString cStr = "<b>"+QString::number(c)+"</b> ";
+                if (stepType == RamStep::AssetProduction) cStr += "assets";
+                else cStr += "shots";
+
+                auto l = new QLabel(state->name(), this);
+                l->setStyleSheet("QLabel { color: "+state->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";

src/rameditwidgets/stepeditwidget.h

@@ -68,7 +68,6 @@ private slots:
     DuQFColorSelector *ui_colorSelector;
 
     ObjectListWidget *m_applicationList;
-
 };
 
 #endif // STEPEDITWIDGET_H

src/ramobjects/ramstep.cpp

@@ -179,12 +179,13 @@ float RamStep::neededDays()
     return estimation() - daysSpent();
 }
 
-QHash<RamState *, int> RamStep::stateCount()
+QVector<RamStep::StateCount> RamStep::stateCount()
 {
     QHash<RamState *, int> states;
+    QVector<RamStep::StateCount> count;
 
     RamProject *proj = project();
-    if (!proj) return states;
+    if (!proj) return count;
 
     const QSet<RamStatus*> status = proj->stepStatus(this);
     for(auto st: status) {
@@ -193,7 +194,16 @@ QHash<RamState *, int> RamStep::stateCount()
         states.insert(s, c+1);
     }
 
-    return states;
+    QHashIterator<RamState*,int> i(states);
+    while(i.hasNext()) {
+        i.next();
+        count.append({ i.key(), i.value()} );
+    }
+    std::sort(count.begin(), count.end(), [] (const StateCount &a, const StateCount &b) {
+        return a.state->completionRatio() < b.state->completionRatio();
+    });
+
+    return count;
 }
 
 QVector<float> RamStep::stats(RamUser *user)

src/ramobjects/ramstep.h

@@ -18,6 +18,12 @@ class RamStep : public RamTemplateStep
 {
     Q_OBJECT
 public:
+
+    struct StateCount {
+        RamState *state;
+        int count;
+    };
+
     static RamStep *get(QString uuid, bool includeRemoved = false);
     static RamStep *c(RamObject *o);
     static RamStep *createFromTemplate(RamTemplateStep *tempStep, RamProject *project);
@@ -41,7 +47,7 @@ class RamStep : public RamTemplateStep
     float daysSpent() ;
     float neededDays() ;
 
-    QHash<RamState*, int> stateCount();
+    QVector<StateCount> stateCount();
 
     /**
      * @brief stats