@@ -29,9 +29,12 @@ class EmployeeAdmin(admin.ModelAdmin): class ProjectInvoiceInline(admin.TabularInline): model = ProjectInvoice +class ProjectTimeInline(admin.TabularInline): + model = ProjectTime + class ProjectAdmin(admin.ModelAdmin): list_display = ('name', 'total_invoiced', 'total_cost', 'profit') - inlines = [ProjectInvoiceInline,] + inlines = [ProjectInvoiceInline, ProjectTimeInline] class ProjectTimeAdmin(admin.ModelAdmin): list_display = ('employee', 'start_date', 'project', 'hours', 'cost', 'cost_converted') beancounter/admin.py @@ -115,6 +115,9 @@ class Project(models.Model): name = models.CharField(max_length=100) active = models.BooleanField(default=True) + class Meta: + ordering = ['-active', 'name'] + def __unicode__(self): return self.name @@ -129,7 +132,9 @@ class Project(models.Model): #TODO aggregate support total = decimal.Decimal("0.00") for time in self.projecttime_set.all(): - total += time.cost_converted + #this test should be in the filter above + if time.cost_converted: + total += time.cost_converted return total def profit(self): @@ -163,6 +168,9 @@ class ProjectTime(models.Model): cost = models.DecimalField(max_digits=9, decimal_places=2, blank=True, null=True, help_text="Leave blank to automatically calculate") cost_converted = models.DecimalField(max_digits=9, decimal_places=2, blank=True, null=True, help_text="Cost converted to local currency") + class Meta: + ordering = ['-start_date', 'project'] + def __unicode__(self): return "%s on %s (%s-%s)" % (self.employee, self.project, self.start_date, self.end_date) beancounter/models.py 13e5e7513eaea5b34ef9a14ffb97a40efd443c38 Peter Baumgartner pete@lincolnloop.com http://github.com/lincolnloop/django-beancounter/commit/7d59c1280550ae4d5177498daf5ef7dea2985f19 7d59c1280550ae4d5177498daf5ef7dea2985f19 2009-01-05T17:41:43-08:00 2009-01-05T17:41:43-08:00 tweak admin display and ordering 297b5c9064f5898e187c46646cf8ad05d0af30ec Peter Baumgartner pete@lincolnloop.com