taskwarrior-web 0.0.2 → 0.0.3

data/CHANGELOG.md

@@ -0,0 +1,6 @@
+## v0.0.3 (5/9/11)
+
+* Fixed floating issue in FF4 on /projects page
+* Added "priority" to list of attributes (no more errors)
+* Added sorting by priority first
+* Added column for priority to all listings

data/lib/taskwarrior-web/app.rb

@@ -78,7 +78,7 @@ module TaskwarriorWeb
       pass unless ['pending', 'completed', 'deleted'].include?(params[:status])
       @title = "#{params[:status].capitalize} Tasks"
       @subnav = subnav('tasks')
-      @tasks = TaskwarriorWeb::Task.find_by_status(params[:status]).sort_by! { |x| [x.due.nil?.to_s, x.due.to_s, x.project.to_s] }
+      @tasks = TaskwarriorWeb::Task.find_by_status(params[:status]).sort_by! { |x| [x.priority.nil?.to_s, x.priority.to_s, x.due.nil?.to_s, x.due.to_s, x.project.to_s] }
       erb :listing
     end
 
@@ -119,14 +119,14 @@ module TaskwarriorWeb
     get '/projects/overview/?' do
       @title = 'Projects'
       @subnav = subnav('projects')
-      @tasks = TaskwarriorWeb::Task.query('status.not' => 'deleted', 'project.not' => '').group_by { |x| x.project.to_s }
+      @tasks = TaskwarriorWeb::Task.query('status.not' => 'deleted', 'project.not' => '').sort_by! { |x| [x.priority.nil?.to_s, x.priority.to_s, x.due.nil?.to_s, x.due.to_s] }.group_by { |x| x.project.to_s }
       erb :projects
     end
 
     get '/projects/:name/?' do
       @subnav = subnav('projects')
       subbed = params[:name].gsub('--', '.') 
-      @tasks = TaskwarriorWeb::Task.query('status.not' => 'deleted', 'project' => subbed).sort_by! { |x| [x.due.nil?.to_s, x.due.to_s] }
+      @tasks = TaskwarriorWeb::Task.query('status.not' => 'deleted', 'project' => subbed).sort_by! { |x| [x.priority.nil?.to_s, x.priority.to_s, x.due.nil?.to_s, x.due.to_s] }
       regex = Regexp.new("^#{subbed}$", Regexp::IGNORECASE)
       @title = @tasks.select { |t| t.project.match(regex) }.first.project
       erb :project

data/lib/taskwarrior-web/task.rb

@@ -7,7 +7,7 @@ module TaskwarriorWeb
 
     TASK_BIN = 'task'
 
-    attr_accessor :id, :entry, :project, :uuid, :description, :status, :due, :start, :end, :tags
+    attr_accessor :id, :entry, :project, :priority, :uuid, :description, :status, :due, :start, :end, :tags
 
     ####################################
     # MODEL METHODS FOR INDIVIDUAL TASKS

data/lib/taskwarrior-web/version.rb

@@ -1,3 +1,3 @@
 module TaskwarriorWeb
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/public/css/styles.css

@@ -251,12 +251,14 @@ a#task-add { float: right; margin: 20px 0; }
 #listing table tr.deleted {  }
 
 #listing .project-container { margin-bottom: 10px; }
+h3.project {
+  float: left;
+  width: auto;
+  margin-bottom: 10px;
+}
 h3.project a {
   color: #000;
   text-decoration: none;
-  width: auto;
-  float: left;
-  margin-bottom: 10px;
   background: url(/images/arrow_right_grey.png) no-repeat right center;
   padding-right: 20px;
 }

data/views/listing.erb

@@ -7,6 +7,7 @@
         <th>Project</th>
         <th>Due</th>
         <th>Tags</th>
+        <th>Priority</th>
       </tr>
     </thead>
     <tbody>
@@ -22,6 +23,7 @@
           <td><a href="/projects/<%= linkify(task.project, :project) %>"><%= task.project %></a></td>
           <td><%= format_date(task.due) unless task.due.nil? %></td>
           <td><%= task.tags.join(', ') unless task.tags.nil? %></td>
+          <td><%= task.priority unless task.priority.nil? %></td>
         </tr>
       <% end %>
     </tbody>

data/views/project.erb

@@ -7,6 +7,7 @@
         <th>Description</th>
         <th>Due</th>
         <th>Tags</th>
+        <th>Priority</th>
       </tr>
     </thead>
     <tbody>
@@ -17,6 +18,7 @@
             <td><%= task.description %></td>
             <td><%= format_date(task.due) unless task.due.nil? %></td>
             <td><%= task.tags.join(', ') unless task.tags.nil? %></td>
+            <td><%= task.priority unless task.priority.nil? %></td>
           </tr>
         <% end %>
       <% end %>

data/views/projects.erb

@@ -9,12 +9,14 @@
         <div class="doneness-container">
           <div class="doneness-measure" style="width: <%= doneness.to_i * 2 %>px;"><%= doneness.to_i %>%</div>
         </div>
+        <div class="clearer"></div>
         <table>
           <thead>
             <tr>
               <th>Description</th>
               <th>Due</th>
               <th>Tags</th>
+              <th>Priority</th>
             </tr>
           </thead>
           <tbody>
@@ -24,6 +26,7 @@
                   <td><%= task.description %></td>
                   <td><%= format_date(task.due) unless task.due.nil? %></td>
                   <td><%= task.tags.join(', ') unless task.tags.nil? %></td>
+                  <td><%= task.priority unless task.priority.nil? %></td>
                 </tr>
               <% end %>
             <% end %>

metadata

@@ -2,7 +2,7 @@
 name: taskwarrior-web
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Jake Bell
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-08 00:00:00 Z
+date: 2011-05-09 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: sinatra
@@ -56,6 +56,7 @@ extra_rdoc_files: []
 
 files: 
 - .gitignore
+- CHANGELOG.md
 - Gemfile
 - README.md
 - Rakefile