← Back to branch summary

~ubuntu-branches/ubuntu/precise/koffice/precise

« back to all changes in this revision

Viewing changes to kplato/libs/ui/kptresourceassignmentview.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Alessandro Ghersi
  • Date: 2010-10-27 17:52:57 UTC
  • mfrom: (0.12.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20101027175257-s04zqqk5bs8ckm9o
Tags: 1:2.2.83-0ubuntu1
* Merge with Debian git remaining changes:
 - Add build-deps on librcps-dev, opengtl-dev, libqtgtl-dev, freetds-dev,
   create-resources, libspnav-dev
 - Remove needless build-dep on libwv2-dev
 - koffice-libs recommends create-resources
 - krita recommends pstoedit
 - Keep our patches
* New upstream release 2.3 beta 3
  - Remove debian/patches fixed by upstream
  - Update install files

Show diffs side-by-side

added added

removed removed

Lines of Context:
kplato/libs/ui/kptresourceassignmentview.cpp
100
100
    kDebug() <<" ---------------- KPlato: Creating ResourceAssignmentView ----------------";
101
101
 
102
102
    widget.setupUi(this);
103
 
    
104
 
    
 
103
 
 
104
 
105
105
   /* QVBoxLayout *l = new QVBoxLayout( this );
106
106
    l->setMargin( 0 );
107
107
    m_splitter = new QSplitter( this );
120
120
    QStringList sl2;
121
121
    sl2 << i18n( "Task" ); << i18n( "Completed" );
122
122
    m_taskList->setHeaderLabels( sl2 );*/
123
 
    
124
 
    
 
123
 
 
124
 
125
125
   /* m_resList = widget.assign( m_resList );
126
126
    m_taskList = widget.assign( m_taskList );
127
127
    m_tasktreeroot = widget.assign( m_tasktreeroot );*/
128
 
    
 
128
 
129
129
 
130
130
    m_selectedItem = 0;
131
131
    m_splitter = widget.m_splitter;
154
154
    QTreeWidgetItem * resItem =  item;
155
155
    if ( resItem ) {
156
156
        m_selectedItem = resItem;
157
 
        updateTasks();
 
157
        updateTasks();
158
158
        return ;
159
159
    }
160
160
    m_selectedItem = 0;
181
181
    if ( m_project == 0 ) {
182
182
        return;
183
183
    }
184
 
    
 
184
 
185
185
    /*Find tasks attributed to the selected item*/
186
186
 
187
187
    /*The selected item is a resource*/
220
220
    }
221
221
}
222
222
 
223
 
void ResourceAssignmentView::drawTasksAttributedToAResource (Resource *res, QTreeWidgetItem *parent)
 
223
void ResourceAssignmentView::drawTasksAttributedToAResource (Resource *res, QTreeWidgetItem */*parent*/)
224
224
{
225
225
    QString taskName;
226
226
    Task *currentTask;
261
261
 
262
262
        /*get name*/
263
263
        currentTask = (rr->parent())->task();
264
 
        taskName = currentTask->name(); 
 
264
        taskName = currentTask->name();
265
265
 
266
266
        /*get status*/
267
267
        /*State: started*/
276
276
        int percent = ((rr->parent())->task())->completion().percentFinished();
277
277
        //kDebug() <<"[void KPlato::ResourceAssignmentView::drawTasksAttributedToAResource()]" << percent <<"";
278
278
        advance.setNum(percent);
279
 
        advance += '%';
 
279
        advance += '%';
280
280
        item->setText( 1, advance );
281
281
        }
282
282
        /*State: Finished*/
334
334
        started->setText( 0, i18n( "Started" ) );
335
335
        finished->setText( 0, i18n( "Finished" ) );
336
336
 
337
 
        foreach ( Resource * res, group->resources() ) {
338
 
            foreach ( ResourceRequest * rr , res->requests() ) {
 
337
        foreach ( Resource * res, group->resources() ) {
 
338
            foreach ( ResourceRequest * rr , res->requests() ) {
339
339
 
340
340
                /*get name*/
341
341
                currentTask = (rr->parent())->task();
342
342
                taskName = currentTask->name();
343
343
 
344
 
                alreadyStored = false; 
 
344
                alreadyStored = false;
345
345
 
346
346
                /*store tasks in the tree*/
347
347
                if ((((rr->parent())->task())->completion().isStarted()) && !(((rr->parent())->task())->completion().isFinished()))
360
360
                    /*Determine the task's advance*/
361
361
                    int percent = ((rr->parent())->task())->completion().percentFinished();
362
362
                    advance.setNum(percent);
363
 
                    advance += '%';
 
363
                    advance += '%';
364
364
                    item->setText( 1, advance );
365
365
                    }
366
 
                }
367
 
                else if (((rr->parent())->task())->completion().isFinished())
 
366
                }
 
367
                else if (((rr->parent())->task())->completion().isFinished())
368
368
                {
369
369
                    for (int i = 0; i < finished->childCount();i++)
370
370
                    {
377
377
                    item = new QTreeWidgetItem( finished );
378
378
                    item->setText( 0, taskName );
379
379
                    }
380
 
                }
381
 
                else 
 
380
                }
 
381
                else
382
382
                {
383
383
                    for (int i = 0; i < notStarted->childCount();i++)
384
384
                    {
392
392
                    item->setText( 0, taskName );
393
393
                    }
394
394
                }
395
 
            }
 
395
            }
396
396
        }
397
397
    }
398
398
}